Browse Source

Bug fix for username in interactive installer

Bob Mottram 10 years ago
parent
commit
3815d9a11b
1 changed files with 7 additions and 1 deletions
  1. 7
    1
      src/freedombone

+ 7
- 1
src/freedombone View File

652
 
652
 
653
 function parse_args {
653
 function parse_args {
654
   if [[ $NO_OF_ARGS == 0 ]]; then
654
   if [[ $NO_OF_ARGS == 0 ]]; then
655
+      echo 'no_of_args = 0'
655
       show_help
656
       show_help
656
       exit 0
657
       exit 0
657
   fi
658
   fi
660
       echo "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
661
       echo "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
661
       exit 1
662
       exit 1
662
   fi
663
   fi
663
-  if [ ! $DOMAIN_NAME ]; then
664
+  if [ ! "$DOMAIN_NAME" ]; then
665
+      echo 'No default domain specified'
664
       show_help
666
       show_help
665
       exit 2
667
       exit 2
666
   fi
668
   fi
667
   if [ ! $MY_USERNAME ]; then
669
   if [ ! $MY_USERNAME ]; then
670
+      echo 'No username specified'
668
       show_help
671
       show_help
669
       exit 3
672
       exit 3
670
   fi
673
   fi
694
   fi
697
   fi
695
 
698
 
696
   if [ -f $CONFIGURATION_FILE ]; then
699
   if [ -f $CONFIGURATION_FILE ]; then
700
+      if grep -q "MY_USERNAME" $CONFIGURATION_FILE; then
701
+          MY_USERNAME=$(grep "MY_USERNAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
702
+      fi
697
       if grep -q "DOMAIN_NAME" $CONFIGURATION_FILE; then
703
       if grep -q "DOMAIN_NAME" $CONFIGURATION_FILE; then
698
           DOMAIN_NAME=$(grep "DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
704
           DOMAIN_NAME=$(grep "DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
699
       fi
705
       fi