From 4cfcf9b1afb2cf47f7f7042b10d0bdaac4635afc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Knut=20Arne=20Bj=C3=B8rndal?=
 <knut.arne.bjorndal@easyconnect.no>
Date: Tue, 24 Jul 2018 16:14:23 +0200
Subject: [PATCH] Improve command and option handling

The way it was structured before meant it was impossible to use the
(documented) filter argument to the tag command.
---
 ganeti-roll-helper.sh | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/ganeti-roll-helper.sh b/ganeti-roll-helper.sh
index 78e9b3e..080fa5d 100755
--- a/ganeti-roll-helper.sh
+++ b/ganeti-roll-helper.sh
@@ -190,6 +190,11 @@ next_clear_offline() {
 }
 
 next() {
+    test $# -eq 0 || {
+	echo "next (and run) does not take any arguments" >&2
+	return 64
+    }
+
     if [ "$(list_nodes "'$next_maintenance_tag' in tags" | wc -l)" -gt 0 ]; then
 	next_evacuate_nodes || return $?;
     elif [ "$(list_nodes "'$in_maintenance_tag' in tags" | wc -l)" -gt 0 ]; then
@@ -219,7 +224,7 @@ usage() {
     fi
 
     cat <<EOF
-Usage: $0 COMMAND [options]
+Usage: $0 [options] COMMAND
 
 COMMANDS:
 
@@ -271,22 +276,6 @@ dryrun=''
 
 finished=''
 
-test $# -eq 0 && usage "Missing command" 64
-
-command="$1"; test $# -gt 0 && shift;
-
-case "$command" in
-    tag) ;;
-    next) ;;
-    run) ;;
-    -h|--help)
-	usage 0;
-	;;
-    *)
-	usage "Unknown command" 64;
-	;;
-esac
-
 while [ $# -gt 0 ]; do
     case "$1" in
 	--needs-maintenance-tag|-t)
@@ -305,10 +294,28 @@ while [ $# -gt 0 ]; do
 	    dryrun=1
 	    shift 1;
 	    ;;
+	-h|--help)
+	    usage 0;
+	    ;;
+	-*)
+	    usage "Unknown option $1" 64;
+	    ;;
 	*)
-	    usage "Unknown flag $1" 64;
+	    break
 	    ;;
     esac
 done
 
+test $# -eq 0 && usage "Missing command" 64
+
+command=''
+case "$1" in
+    tag) command='tag'; shift ;;
+    next) command='next'; shift ;;
+    run) command='run'; shift ;;
+    *)
+	usage "Unknown command $1" 64;
+	;;
+esac
+
 "$command" "$@" || exit $?
-- 
2.11.4.GIT