[v2,2/2] buildscript: Improve loop for applying build_patches

Submitted by Adrian Schmutzler on April 8, 2019, 1:32 p.m.

Details

Message ID 20190408133211.8970-2-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler April 8, 2019, 1:32 p.m. 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 buildscript | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/buildscript b/buildscript
index 1605b9cf..4e4da92f 100755
--- a/buildscript
+++ b/buildscript
@@ -115,12 +115,10 @@  get_source() {
 }
 
 patch_target() {
-    if [ "$(find "$PWD"/build_patches/openwrt/*.patch 2> /dev/null | wc -l)" -ge 1 ]; then
-        for patch in "$PWD"/build_patches/openwrt/*.patch; do
-            echo "Applying $patch:"
-            patch --no-backup-if-mismatch -p1 -d "$target" -i "$patch"
-        done
-    fi
+    for patch in $(ls "$PWD"/build_patches/openwrt/*.patch 2>/dev/null); do
+        echo "Applying $patch:"
+        patch --no-backup-if-mismatch -p1 -d "$target" -i "$patch"
+    done
 }
 
 prepare() {

Comments

Robert Langhammer April 8, 2019, 2:16 p.m. 
Hi Adrian,

sollte passen.

Reviewed-by: Robert Langhammer <rlanghammer@web.de>

Am 08.04.19 um 15:32 schrieb Adrian Schmutzler:
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  buildscript | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/buildscript b/buildscript
> index 1605b9cf..4e4da92f 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -115,12 +115,10 @@ get_source() {
>  }
>
>  patch_target() {
> -    if [ "$(find "$PWD"/build_patches/openwrt/*.patch 2> /dev/null | wc -l)" -ge 1 ]; then
> -        for patch in "$PWD"/build_patches/openwrt/*.patch; do
> -            echo "Applying $patch:"
> -            patch --no-backup-if-mismatch -p1 -d "$target" -i "$patch"
> -        done
> -    fi
> +    for patch in $(ls "$PWD"/build_patches/openwrt/*.patch 2>/dev/null); do
> +        echo "Applying $patch:"
> +        patch --no-backup-if-mismatch -p1 -d "$target" -i "$patch"
> +    done
>  }
>
>  prepare() {