diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-29 12:36:45 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-29 12:36:45 -0400 |
commit | 1569bb18ae9071dd56142f226a807783305309ab (patch) | |
tree | f13751099a5b11403388938364d45ba3826365a6 /src | |
parent | 3ff5d7ac010562c2a9d8d7a6bbcb8105485bacd1 (diff) |
Rely on Bash 4.4 empty array behavior
Diffstat (limited to 'src')
-rwxr-xr-x | src/chroot-tools/librechroot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 0b0ce0c..1896711 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -54,7 +54,7 @@ hack_arch_nspawn_flags() { local makepkg_conf="$copydir/etc/makepkg.conf" OPTIND=1 - set -- ${arch_nspawn_flags+"${arch_nspawn_flags[@]}"} + set -- "${arch_nspawn_flags[@]}" while getopts 'hC:M:c:f:s' arg; do case "$arg" in M) makepkg_conf="$OPTARG" ;; @@ -103,13 +103,13 @@ arch-nspawn() { local copydir=$1; shift local cmd=("$@") - local arch_nspawn_flags=(${arch_nspawn_flags+"${arch_nspawn_flags[@]}"}) + local arch_nspawn_flags=("${arch_nspawn_flags[@]}") hack_arch_nspawn_flags "$copydir" "$_arch_nspawn" \ - ${arch_nspawn_flags+"${arch_nspawn_flags[@]}"} \ + "${arch_nspawn_flags[@]}" \ "$copydir" \ - ${sysd_nspawn_flags+"${sysd_nspawn_flags[@]}"} \ + "${sysd_nspawn_flags[@]}" \ -- \ "${cmd[@]}" } @@ -119,11 +119,11 @@ mkarchroot() { local copydir=$1; shift local pkgs=("$@") - local arch_nspawn_flags=(${arch_nspawn_flags+"${arch_nspawn_flags[@]}"}) + local arch_nspawn_flags=("${arch_nspawn_flags[@]}") hack_arch_nspawn_flags "$copydir" unshare -m "$_mkarchroot" \ - ${arch_nspawn_flags+"${arch_nspawn_flags[@]}"} \ + "${arch_nspawn_flags[@]}" \ "$copydir" \ "${pkgs[@]}" } |