[master,v2] fix patching error by emty build_patches dir

Submitted by Jan-Tarek Butt on Aug. 29, 2016, 12:45 a.m.

Details

Message ID 20160829004538.32249-1-tarek@ring0.de
State Changes Requested
Headers show

Commit Message

Jan-Tarek Butt Aug. 29, 2016, 12:45 a.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..43997bf 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 (( `ls $PWD/build_patches/openwrt/*.patch 2> /dev/null | wc -l` )); 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, 10:17 a.m. 
Am Montag, den 29.08.2016, 02:45 +0200 schrieb Jan-Tarek Butt:
> ---
>  buildscript | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/buildscript b/buildscript
> index 04942e6..43997bf 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 (( `ls $PWD/build_patches/openwrt/*.patch 2> /dev/null | wc -l` )); then
             ^-- SC2006: Use $(..) instead of deprecated `..`
              ^-- SC2012: Use find instead of ls to better handle non-alphanumeric filenames.
                 ^-- SC2086: Double quote to prevent globbing and word splitting.

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
>