On Sat, Jun 18, 2011 at 07:04:26AM +0200, Sebastien Luttringer wrote:
> 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
> No such hook: sex
>
> Signed-off-by: Sebastien Luttringer <se...@seblu.net>
> ---
> mkinitcpio | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/mkinitcpio b/mkinitcpio
> index 70710eb..7b8f503 100755
> --- a/mkinitcpio
> +++ b/mkinitcpio
> @@ -102,7 +102,8 @@ while getopts ':c:k:s:b:g:a:p:m:vH:LMhS:' arg; do
> IFS=${OLDIFS}
> unset OLDIFS
> ;;
> - H) . "${INSTDIR}/${OPTARG}";
> + H) [[ ! -r "${INSTDIR}/${OPTARG}" ]] && echo "No such hook:
> ${OPTARG}" && exit 1
> + . "${INSTDIR}/${OPTARG}";
> echo "Help for hook '${OPTARG}':"
> help
> cleanup
> --
> Sebastien "Seblu" Luttringer
>
If we're going to check this (and I agree we should -- was about to push
my own patch), there should be a check to make sure 'help' exists as a
function as well after sourcing the hook.
d
