Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/makechrootpkg.in
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2017-09-03 03:53:40 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2018-01-02 12:36:40 -0500
commit8af72e9c3ffd97d4a4d00e3c31d34487dbecb1b6 (patch)
treebcd8e62f82a506561d73f1c0b41932e2cc392901 /makechrootpkg.in
parentbc601188743a10e1865c61e28417427dc11e2cda (diff)
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> Reviewed-by: Luke Shumaker <lukeshu@parabola.nu>
Diffstat (limited to 'makechrootpkg.in')
-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