Browse Source

Show possible variants

Bob Mottram 8 years ago
parent
commit
b507d20f72
3 changed files with 14 additions and 1 deletions
  1. 2
    1
      src/freedombone
  2. 2
    0
      src/freedombone-utils-help
  3. 10
    0
      src/freedombone-utils-selector

+ 2
- 1
src/freedombone View File

@@ -288,7 +288,8 @@ function parse_args {
288 288
     fi
289 289
 
290 290
     if [[ $(is_valid_variant) == "0" ]]; then
291
-        echo $"'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant."
291
+        echo $"'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant. Possible variants are:"
292
+        show_available_variants
292 293
         exit 367245
293 294
     fi
294 295
 }

+ 2
- 0
src/freedombone-utils-help View File

@@ -66,6 +66,8 @@ function show_help {
66 66
     echo $'     --ns2              Second DNS nameserver'
67 67
     echo $'     --repo             Debian repository'
68 68
     echo ''
69
+    echo 'Possible variants are:'
70
+    show_available_variants
69 71
     exit 0
70 72
 }
71 73
 

+ 10
- 0
src/freedombone-utils-selector View File

@@ -124,6 +124,16 @@ function is_valid_variant {
124 124
     return "0"
125 125
 }
126 126
 
127
+function show_available_variants {
128
+    available_variants_list=()
129
+    available_system_variants
130
+
131
+    for variant_str in "${available_variants_list[@]}"
132
+    do
133
+        echo "  $variant_str"
134
+    done
135
+}
136
+
127 137
 # mark a given app as having been removed so that it doesn't get reinstalled on updates
128 138
 function remove_app {
129 139
     app_name=$1