From fcbc37fb7732c4b8a59ee0bfa8035ba8f81132e4 Mon Sep 17 00:00:00 2001 From: Thomas Bächler Date: Sun, 27 Feb 2011 12:17:18 +0100 Subject: Use in_array instead of grep -w when checking SKIPHOOKS. This fixes FS#22821. --- mkinitcpio | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 2397776..b4497e2 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -27,7 +27,7 @@ GENIMG="" APPEND="" PRESET="" MESSAGE="" -SKIPHOOKS="" +SKIPHOOKS=() PRESETDIR="mkinitcpio.d" QUIET="y" SHOW_AUTOMODS="n" @@ -92,7 +92,12 @@ while getopts ':c:k:s:b:g:a:p:m:vH:LMhS:' arg; do p) PRESET="${OPTARG}" ;; m) MESSAGE="${OPTARG}" ;; v) QUIET="n" ;; - S) SKIPHOOKS="${OPTARG}" ;; + S) OLDIFS=${IFS} + IFS=, + SKIPHOOKS=(${OPTARG}) + IFS=${OLDIFS} + unset OLDIFS + ;; H) . "${INSTDIR}/${OPTARG}"; echo "Help for hook '${OPTARG}':" help @@ -232,7 +237,7 @@ fi parse_hook for hook in ${HOOKS}; do - echo "${SKIPHOOKS}" | grep -qw ${hook} && continue + in_array ${hook} ${SKIPHOOKS[@]} && continue unset MODULES unset BINARIES unset FILES -- cgit v1.2.3-24-g4f1b