diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2017-09-03 03:53:40 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-01-03 14:55:21 -0500 |
| commit | 8e8a5ebb72154fdc0450c74256a02fbc5da8de42 (patch) | |
| tree | f04766c8b5359f6a1d9f962ef6cf5a1fabc375f7 | |
| parent | 73c1581fef3a5410b1edc9600e45edc15991784f (diff) | |
| download | devtools32-8e8a5ebb72154fdc0450c74256a02fbc5da8de42.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>
Reviewed-by: Luke Shumaker <lukeshu@parabola.nu>
| -rw-r--r-- | makechrootpkg.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index cacc52a..5a2e32a 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}" @@ -227,7 +227,7 @@ Server = file:///repo 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 |