summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2017-09-03 09:53:40 +0200
committerBartłomiej Piotrowski <bpiotrowski@archlinux.org>2018-01-21 14:16:10 +0100
commit48b2f8dcc49d88e60bd9e4ee97c92fea8ac90721 (patch)
treebcd8e62f82a506561d73f1c0b41932e2cc392901
parent3b725b58434b92e93ff90164fae8d76c4761706a (diff)
downloaddevtools-48b2f8dcc49d88e60bd9e4ee97c92fea8ac90721.tar.gz
devtools-48b2f8dcc49d88e60bd9e4ee97c92fea8ac90721.tar.xz
makechrootpkg: Fix anti-pattern when checking for enabled features
Don't use error-prone logic e.g. foo=true; if $foo ... This completely fails to act as expected when the variable is unset because of unrelated bugs. While this merely causes the default behavior to be "false" rather than "true" in such cases, it is better to fail to enable explicitly requested behavior (which will be noticed by the user) than to simply upgrade to this behavior for free (which may not seem to have any obvious cause). Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
-rw-r--r--makechrootpkg.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 02c91bc..c7fe076 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -165,7 +165,7 @@ prepare_chroot() {
local keepbuilddir=$3
local run_namcap=$4
- $keepbuilddir || rm -rf "$copydir/build"
+ [[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
local builduser_uid builduser_gid
builduser_uid="${SUDO_UID:-$UID}"
@@ -208,7 +208,7 @@ EOF
declare -p SOURCE_DATE_EPOCH 2>/dev/null
printf '_chrootbuild "$@" || exit\n'
- if $run_namcap; then
+ if [[ $run_namcap = true ]]; then
declare -f _chrootnamcap
printf '_chrootnamcap || exit\n'
fi