|
 |
a52f674 |
From e393b85d62f02206ca52ac3de3debf9249f7777e Mon Sep 17 00:00:00 2001
|
|
|
b12ff75 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
b12ff75 |
Date: Sun, 8 Dec 2013 07:46:46 -0500
|
|
|
b12ff75 |
Subject: [PATCH] kernel-install: add -h/--help
|
|
|
b12ff75 |
|
|
|
a52f674 |
(cherry picked from commit a6c3d202b14939006f39e22179a058159a8512fb)
|
|
|
b12ff75 |
---
|
|
|
b12ff75 |
src/kernel-install/kernel-install | 21 ++++++++++++++-------
|
|
|
b12ff75 |
1 file changed, 14 insertions(+), 7 deletions(-)
|
|
|
b12ff75 |
|
|
|
b12ff75 |
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
|
|
|
b12ff75 |
index 9d3e75d..f5ff362 100644
|
|
|
b12ff75 |
--- a/src/kernel-install/kernel-install
|
|
|
b12ff75 |
+++ b/src/kernel-install/kernel-install
|
|
|
b12ff75 |
@@ -21,9 +21,9 @@
|
|
|
b12ff75 |
|
|
|
b12ff75 |
usage()
|
|
|
b12ff75 |
{
|
|
|
b12ff75 |
- echo "Usage:" >&2
|
|
|
b12ff75 |
- echo " $0 add <kernel-version> <kernel-image>" >&2
|
|
|
b12ff75 |
- echo " $0 remove <kernel-version> <kernel-image>" >&2
|
|
|
b12ff75 |
+ echo "Usage:"
|
|
|
b12ff75 |
+ echo " $0 add KERNEL-VERSION KERNEL-IMAGE"
|
|
|
b12ff75 |
+ echo " $0 remove KERNEL-VERSION KERNEL-IMAGE"
|
|
|
b12ff75 |
}
|
|
|
b12ff75 |
|
|
|
b12ff75 |
dropindirs_sort()
|
|
|
b12ff75 |
@@ -54,6 +54,13 @@ dropindirs_sort()
|
|
|
b12ff75 |
|
|
|
b12ff75 |
export LC_COLLATE=C
|
|
|
b12ff75 |
|
|
|
b12ff75 |
+for i in "$@"; do
|
|
|
b12ff75 |
+ if [ "$i" == "--help" -o "$i" == "-h" ]; then
|
|
|
b12ff75 |
+ usage
|
|
|
b12ff75 |
+ exit 0
|
|
|
b12ff75 |
+ fi
|
|
|
b12ff75 |
+done
|
|
|
b12ff75 |
+
|
|
|
b12ff75 |
if [[ "${0##*/}" == 'installkernel' ]]; then
|
|
|
b12ff75 |
COMMAND='add'
|
|
|
b12ff75 |
else
|
|
|
b12ff75 |
@@ -75,7 +82,7 @@ if ! [[ $MACHINE_ID ]]; then
|
|
|
b12ff75 |
fi
|
|
|
b12ff75 |
|
|
|
b12ff75 |
if [[ ! $COMMAND ]] || [[ ! $KERNEL_VERSION ]]; then
|
|
|
b12ff75 |
- usage
|
|
|
b12ff75 |
+ echo "Not enough arguments" >&2
|
|
|
b12ff75 |
exit 1
|
|
|
b12ff75 |
fi
|
|
|
b12ff75 |
|
|
|
b12ff75 |
@@ -90,8 +97,8 @@ readarray -t PLUGINS < <(
|
|
|
b12ff75 |
|
|
|
b12ff75 |
case $COMMAND in
|
|
|
b12ff75 |
add)
|
|
|
b12ff75 |
- if [[ ! $KERNEL_IMAGE ]]; then
|
|
|
b12ff75 |
- usage
|
|
|
b12ff75 |
+ if [[ ! "$KERNEL_IMAGE" ]]; then
|
|
|
b12ff75 |
+ echo "Command 'add' requires an argument" >&2
|
|
|
b12ff75 |
exit 1
|
|
|
b12ff75 |
fi
|
|
|
b12ff75 |
|
|
|
b12ff75 |
@@ -121,7 +128,7 @@ case $COMMAND in
|
|
|
b12ff75 |
;;
|
|
|
b12ff75 |
|
|
|
b12ff75 |
*)
|
|
|
b12ff75 |
- usage
|
|
|
b12ff75 |
+ echo "Unknown command '$COMMAND'" >&2
|
|
|
b12ff75 |
exit 1
|
|
|
b12ff75 |
;;
|
|
|
b12ff75 |
esac
|