summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Linderud <morten@linderud.pw>2019-09-17 21:42:02 +0200
committerGiancarlo Razzolini <grazzolini@archlinux.org>2019-10-04 19:29:17 +0200
commit7984722e127d411d2c978eaa9665709b4a681485 (patch)
tree995c489b280f116f64e8252ce4af6f60e1c9f7f2
parent001a0559cd52d2ab600e31d192198062021e8898 (diff)
downloadmkinitcpio-7984722e127d411d2c978eaa9665709b4a681485.tar.gz
mkinitcpio-7984722e127d411d2c978eaa9665709b4a681485.tar.xz
[mkinitcpio] Fixup declaration and remove trailing :
-rwxr-xr-xmkinitcpio7
1 files changed, 3 insertions, 4 deletions
diff --git a/mkinitcpio b/mkinitcpio
index f40cd6d..9d4357e 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -14,8 +14,7 @@ _f_functions=functions
_f_config=mkinitcpio.conf
_d_hooks="$PWD/hooks:/usr/lib/initcpio/hooks:/lib/initcpio/hooks"
_d_install="$PWD/install:/usr/lib/initcpio/install:/lib/initcpio/install"
-_d_flag_hooks=""
-_d_flag_install=""
+_d_flag_{hooks,install}=
_d_firmware=({/usr,}/lib/firmware/updates {/usr,}/lib/firmware)
_d_presets=mkinitcpio.d
@@ -429,8 +428,8 @@ if [[ -t 1 ]] && (( _optcolor )); then
fi
if [[ -n $_d_flag_hooks && -n $_d_flag_install ]]; then
- _d_hooks=$_d_flag_hooks
- _d_install=$_d_flag_install
+ _d_hooks=${_d_flag_hooks%:}
+ _d_install=${_d_flag_install%:}
fi
# insist that /proc and /dev be mounted (important for chroots)