summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorliandro sg <liandrosg@gmail.com>2011-05-18 19:42:51 +0200
committerDaniel Baumann <daniel@debian.org>2011-05-18 19:42:51 +0200
commit11eeea6f6c81d69c2c685bb6dafbb8126094ff48 (patch)
tree9c929bcbd6827f776ca671065cceb63bb4808920 /scripts/build
parentceefa557a9180e2e4192050a1013cd3194f192d9 (diff)
downloadvyos-live-build-11eeea6f6c81d69c2c685bb6dafbb8126094ff48.tar.gz
vyos-live-build-11eeea6f6c81d69c2c685bb6dafbb8126094ff48.zip
Be more careful with subshells (Closes: #623356).
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary_local-hooks2
-rwxr-xr-xscripts/build/lb_chroot_hooks2
-rwxr-xr-xscripts/build/lb_chroot_local-hooks2
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary_local-hooks b/scripts/build/lb_binary_local-hooks
index 729200db4..e3c08c292 100755
--- a/scripts/build/lb_binary_local-hooks
+++ b/scripts/build/lb_binary_local-hooks
@@ -50,7 +50,7 @@ then
fi
# Executing hook
- ./"${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
+ ./"${HOOK}" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
done
# Creating stage file
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index 3a1595673..0251b3507 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -55,7 +55,7 @@ do
fi
# Executing hook
- Chroot chroot "./root/${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
+ Chroot chroot "./root/${HOOK}" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
# Removing hook
rm -f chroot/root/"${HOOK}"
diff --git a/scripts/build/lb_chroot_local-hooks b/scripts/build/lb_chroot_local-hooks
index c163ca3a1..c6482c569 100755
--- a/scripts/build/lb_chroot_local-hooks
+++ b/scripts/build/lb_chroot_local-hooks
@@ -56,7 +56,7 @@ then
fi
# Executing hook
- Chroot chroot "/root/$(basename ${HOOK})" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
+ Chroot chroot "/root/$(basename ${HOOK})" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
# Removing hook
rm -f chroot/root/"$(basename ${HOOK})"