From b507d20f72572d927d9314e6dc8b673da14ac500 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 8 Oct 2016 19:55:21 +0100
Subject: [PATCH] Show possible variants
---
src/freedombone | 3 ++-
src/freedombone-utils-help | 2 ++
src/freedombone-utils-selector | 10 ++++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/freedombone b/src/freedombone
index 5c7178221..60615b8ed 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -288,7 +288,8 @@ function parse_args {
fi
if [[ $(is_valid_variant) == "0" ]]; then
- echo $"'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant."
+ echo $"'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant. Possible variants are:"
+ show_available_variants
exit 367245
fi
}
diff --git a/src/freedombone-utils-help b/src/freedombone-utils-help
index 2f86b1095..a89d175ff 100755
--- a/src/freedombone-utils-help
+++ b/src/freedombone-utils-help
@@ -66,6 +66,8 @@ function show_help {
echo $' --ns2 Second DNS nameserver'
echo $' --repo Debian repository'
echo ''
+ echo 'Possible variants are:'
+ show_available_variants
exit 0
}
diff --git a/src/freedombone-utils-selector b/src/freedombone-utils-selector
index 606348434..fdf3c8145 100755
--- a/src/freedombone-utils-selector
+++ b/src/freedombone-utils-selector
@@ -124,6 +124,16 @@ function is_valid_variant {
return "0"
}
+function show_available_variants {
+ available_variants_list=()
+ available_system_variants
+
+ for variant_str in "${available_variants_list[@]}"
+ do
+ echo " $variant_str"
+ done
+}
+
# mark a given app as having been removed so that it doesn't get reinstalled on updates
function remove_app {
app_name=$1
--
GitLab