From cfe3b79ca87ee47bdbdefce065a0e306bf8fabdc Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Thu, 9 Jan 2014 20:20:34 +0100 Subject: [PATCH] Fix `make patch' for more than one patch file --- scripts/patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patch.sh b/scripts/patch.sh index 5cc79e0f2..9a4a64bba 100755 --- a/scripts/patch.sh +++ b/scripts/patch.sh @@ -9,7 +9,7 @@ for module in $GLUON_MODULES; do cd "$1"/$module git checkout -B patching base - if [ "$1"/patches/$module/*.patch ]; then + if [ "$(echo "$1"/patches/$module/*.patch)" ]; then git am "$1"/patches/$module/*.patch || ( git am --abort git checkout patched -- GitLab