Browse Source

Selected username

Bob Mottram 9 years ago
parent
commit
f81489bd74
1 changed files with 12 additions and 7 deletions
  1. 12
    7
      src/freedombone-config

+ 12
- 7
src/freedombone-config View File

110
 MINIMAL_INSTALL="yes"
110
 MINIMAL_INSTALL="yes"
111
 DEFAULT_LANGUAGE='en_GB.UTF-8'
111
 DEFAULT_LANGUAGE='en_GB.UTF-8'
112
 ONION_ONLY="no"
112
 ONION_ONLY="no"
113
+SELECTED_USERNAME=
113
 
114
 
114
 # Mirrors settings
115
 # Mirrors settings
115
 FRIENDS_MIRRORS_SERVER=
116
 FRIENDS_MIRRORS_SERVER=
810
             exit 62753
811
             exit 62753
811
         fi
812
         fi
812
         # when installing from an image which comes with a known default user account
813
         # when installing from an image which comes with a known default user account
813
-        selected_username=
814
-        while [ ! $selected_username ]
814
+        SELECTED_USERNAME=
815
+        while [ ! $SELECTED_USERNAME ]
815
         do
816
         do
816
-            if [ ! $selected_username ]; then
817
-                selected_username=$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')
817
+            if [ ! $SELECTED_USERNAME ]; then
818
+                SELECTED_USERNAME=$(grep 'MY_USERNAME' temp.cfg | awk -F '=' '{print $2}')
818
             fi
819
             fi
819
             data=$(tempfile 2>/dev/null)
820
             data=$(tempfile 2>/dev/null)
820
             trap "rm -f $data" 0 1 2 5 15
821
             trap "rm -f $data" 0 1 2 5 15
821
             dialog --backtitle $"Freedombone Configuration" \
822
             dialog --backtitle $"Freedombone Configuration" \
822
                    --title $"Username" \
823
                    --title $"Username" \
823
-                   --inputbox $"Set your username for the system\n\nYour username should not contain any spaces" 12 60 "$selected_username" 2> $data
824
+                   --inputbox $"Set your username for the system\n\nYour username should not contain any spaces" 12 60 "$SELECTED_USERNAME" 2> $data
824
             sel=$?
825
             sel=$?
825
             case $sel in
826
             case $sel in
826
                 0) possible_username=$(cat $data)
827
                 0) possible_username=$(cat $data)
827
-                   selected_username=
828
+                   SELECTED_USERNAME=
828
                    if [[ $possible_username != *' '* && $possible_username != *'/'* && $possible_username != *'\'* && $possible_username != *'*'* ]]; then
829
                    if [[ $possible_username != *' '* && $possible_username != *'/'* && $possible_username != *'\'* && $possible_username != *'*'* ]]; then
829
                        if [ $possible_username ]; then
830
                        if [ $possible_username ]; then
830
                            if [ ${#possible_username} -gt 1 ]; then
831
                            if [ ${#possible_username} -gt 1 ]; then
861
                 MY_USERNAME=$DEFAULT_DOMAIN_NAME
862
                 MY_USERNAME=$DEFAULT_DOMAIN_NAME
862
             else
863
             else
863
                 select_user
864
                 select_user
864
-                MY_USERNAME=$SELECTED_USERNAME
865
+                if [ ! $SELECTED_USERNAME ]; then
866
+                    echo $'No username selected'
867
+                    exit 72589
868
+                fi
869
+                MY_USERNAME="$SELECTED_USERNAME"
865
             fi
870
             fi
866
         fi
871
         fi
867
     fi
872
     fi