X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fkernel-install%2Fkernel-install;fp=src%2Fkernel-install%2Fkernel-install;h=f5ff3622a49236e4d98b8178dc4f455c34018ab2;hp=9d3e75db08102dd582252be422654a2579208b93;hb=a6c3d202b14939006f39e22179a058159a8512fb;hpb=014e7ea7f2361e9431926fca1959d868b9f3a430

diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
index 9d3e75db0..f5ff3622a 100644
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@@ -21,9 +21,9 @@
 
 usage()
 {
-    echo "Usage:" >&2
-    echo "        $0 add <kernel-version> <kernel-image>" >&2
-    echo "        $0 remove <kernel-version> <kernel-image>" >&2
+    echo "Usage:"
+    echo "        $0 add KERNEL-VERSION KERNEL-IMAGE"
+    echo "        $0 remove KERNEL-VERSION KERNEL-IMAGE"
 }
 
 dropindirs_sort()
@@ -54,6 +54,13 @@ dropindirs_sort()
 
 export LC_COLLATE=C
 
+for i in "$@"; do
+    if [ "$i" == "--help" -o "$i" == "-h" ]; then
+        usage
+        exit 0
+    fi
+done
+
 if [[ "${0##*/}" == 'installkernel' ]]; then
     COMMAND='add'
 else
@@ -75,7 +82,7 @@ if ! [[ $MACHINE_ID ]]; then
 fi
 
 if [[ ! $COMMAND ]] || [[ ! $KERNEL_VERSION ]]; then
-    usage
+    echo "Not enough arguments" >&2
     exit 1
 fi
 
@@ -90,8 +97,8 @@ readarray -t PLUGINS < <(
 
 case $COMMAND in
     add)
-        if [[ ! $KERNEL_IMAGE ]]; then
-            usage
+        if [[ ! "$KERNEL_IMAGE" ]]; then
+            echo "Command 'add' requires an argument" >&2
             exit 1
         fi
 
@@ -121,7 +128,7 @@ case $COMMAND in
         ;;
 
     *)
-        usage
+        echo "Unknown command '$COMMAND'" >&2
         exit 1
         ;;
 esac