[arch-projects] [MKINITCPIO][PATCH 2/5] Fix printing of bash usage when asking for a bad hook

26 Jun 2011

before:
mkinitcpio -H sex
/sbin/mkinitcpio: line 105: /lib/initcpio/install/sex: No such file or directory
Help for hook 'sex':
GNU bash, version 4.2.10(2)-release (x86_64-unknown-linux-gnu)
These shell commands are defined internally.  Type `help' to see this list.

after:
mkinitcpio -H sex
==> ERROR: No hook sex

Signed-off-by: Sebastien Luttringer <seblu@seblu.net>
---
 mkinitcpio |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mkinitcpio b/mkinitcpio
index 4082ba5..bd1a4c8 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -118,8 +118,12 @@ while getopts ':c:k:sb:g:p:m:nvH:LMhS:t:z:' arg; do
            IFS=${OLDIFS}
            unset OLDIFS
            ;;
-        H) . "${INSTDIR}/${OPTARG}";
-           msg "Help for hook '${OPTARG}'"
+        H) if [[ ! -r "${INSTDIR}/${OPTARG}" ]]; then
+               error "No hook ${OPTARG}"
+               exit 1
+           fi
+           . "${INSTDIR}/${OPTARG}"
+           echo "Help for hook '${OPTARG}':"
            help
            exit 0 ;;
         L) msg "Available hooks"
-- 
Sebastien "Seblu" Luttringer

    