From 161875525d8d0cd44eaa72a76f2d7d903c1bb3b7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 17 Oct 2016 18:17:11 +0100
Subject: [PATCH] Show only valid users
---
src/freedombone-config | 8 +++++---
src/freedombone-controlpanel | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/freedombone-config b/src/freedombone-config
index 14404f806..540503978 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -1302,9 +1302,11 @@ function select_user {
name=()
for u in ${users_array[@]}
do
- i=$((i+1))
- W+=($i "$u")
- name+=("$u")
+ if [[ $(is_valid_user "$u") == "1" ]]; then
+ i=$((i+1))
+ W+=($i "$u")
+ name+=("$u")
+ fi
done
user_index=$(dialog --backtitle $"Freedombone Configuration" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index bdc0e3e0d..03d13d01d 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -396,9 +396,11 @@ function select_user {
name=()
for u in ${users_array[@]}
do
- i=$((i+1))
- W+=($i "$u")
- name+=("$u")
+ if [[ $(is_valid_user "$u") == "1" ]]; then
+ i=$((i+1))
+ W+=($i "$u")
+ name+=("$u")
+ fi
done
user_index=$(dialog --backtitle $"Freedombone Control Panel" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)
--
GitLab