[master,v3] fix patching error by empty build_patches dir

Submitted by Jan-Tarek Butt on Sept. 10, 2016, 6:32 p.m.

Details

Message ID 20160910183229.30871-1-tarek@ring0.de
State Superseded
Headers show

Commit Message

Jan-Tarek Butt Sept. 10, 2016, 6:32 p.m. 
---
 buildscript | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--
2.9.3

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index 04942e6..1474966 100755
--- a/buildscript
+++ b/buildscript
@@ -122,9 +122,11 @@  get_source() {
 }

 patch_target() {
-    for patch in "$PWD"/build_patches/openwrt/*.patch; do
-        patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
-    done
+    if [ $(find $PWD/build_patches/openwrt/*.patch 2> /dev/null | wc -l) -ge 1 ]; then
+        for patch in "$PWD"/build_patches/openwrt/*.patch; do
+            patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
+        done
+    fi
 }

 prepare() {

Comments

Tim Niemeyer Sept. 10, 2016, 6:44 p.m. 
Moin Tarek

Am Samstag, den 10.09.2016, 20:32 +0200 schrieb Jan-Tarek Butt:
> ---
>  buildscript | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index 04942e6..1474966 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -122,9 +122,11 @@ get_source() {
>  }
> 
>  patch_target() {
> -    for patch in "$PWD"/build_patches/openwrt/*.patch; do
> -        patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
> -    done
> +    if [ $(find $PWD/build_patches/openwrt/*.patch 2> /dev/null | wc -l) -ge 1 ]; then
            ^-- SC2046: Quote this to prevent word splitting.
                   ^-- SC2086: Double quote to prevent globbing and word splitting.

Bevor wir das Spiel noch dreimal machen.. Bitte prüf deine Änderungen im
shellcheck.

Tim

> +        for patch in "$PWD"/build_patches/openwrt/*.patch; do
> +            patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
> +        done
> +    fi
>  }
> 
>  prepare() {
> --
> 2.9.3
>
Jan-Tarek Butt Sept. 10, 2016, 7:14 p.m. 
Hi,

> Am Samstag, den 10.09.2016, 20:32 +0200 schrieb Jan-Tarek Butt:
>> ---
>>  buildscript | 8 +++++---
>>  1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/buildscript b/buildscript
>> index 04942e6..1474966 100755
>> --- a/buildscript
>> +++ b/buildscript
>> @@ -122,9 +122,11 @@ get_source() {
>>  }
>>
>>  patch_target() {
>> -    for patch in "$PWD"/build_patches/openwrt/*.patch; do
>> -        patch --no-backup-if-mismatch -p0 -d "$target" -i "$patch"
>> -    done
>> +    if [ $(find $PWD/build_patches/openwrt/*.patch 2> /dev/null | wc -l) -ge 1 ]; then
>             ^-- SC2046: Quote this to prevent word splitting.
>                    ^-- SC2086: Double quote to prevent globbing and word splitting.
> 
> Bevor wir das Spiel noch dreimal machen.. Bitte prüf deine Änderungen im
> shellcheck.

Ah danke für den hinweiß :) coole seite.

vg
Tarek