Quellcode durchsuchen

Rewrite route with sane(r) approach ro targets

Simplify maintenance by moving list of valid_targets to a separate
function.  Both router and usage message are now consumers thereof.

This also changes format of the usage message.
Alois Mahdal vor 9 Jahren
Ursprung
Commit
af419ea8b8
1 geänderte Dateien mit 30 neuen und 7 gelöschten Zeilen
  1. 30
    7
      src/include/mkit.sh

+ 30
- 7
src/include/mkit.sh Datei anzeigen

@@ -87,11 +87,34 @@ route() {
87 87
     #
88 88
     # Call correct function based on $1
89 89
     #
90
-    case $1 in
91
-        build|build_manpages|clean|dist|rpmstuff|install|release_?|uninstall|vbump_?)
92
-            $1
93
-            ;;
94
-        *)
95
-            echo "usage: $(basename "$0") build|clean|dist|rpmstuff|install|uninstall" >&2
96
-    esac
90
+    if valid_targets | grep -qwx "^$1";
91
+    then
92
+        "$1"
93
+    else
94
+        {
95
+            echo "usage: $(basename "$0") TARGET"
96
+            echo
97
+            echo "valid targets:"
98
+            valid_targets | sed 's/^/    /'
99
+        } >&2
100
+    fi
101
+}
102
+
103
+valid_targets() {
104
+    #
105
+    # List valid routes
106
+    #
107
+    echo build
108
+    echo build_manpages
109
+    echo clean
110
+    echo dist
111
+    echo install
112
+    echo release_x
113
+    echo release_y
114
+    echo release_z
115
+    echo rpmstuff
116
+    echo uninstall
117
+    echo vbump_x
118
+    echo vbump_y
119
+    echo vbump_z
97 120
 }