Bob Mottram пре 10 година
родитељ
комит
e74fce956b
2 измењених фајлова са 8 додато и 12 уклоњено
  1. 7
    10
      src/freedombone
  2. 1
    2
      src/freedombone-config

+ 7
- 10
src/freedombone Прегледај датотеку

473
   fi
473
   fi
474
 
474
 
475
   freedombone-config \
475
   freedombone-config \
476
-      -u $MY_USERNAME \
477
       -f $CONFIGURATION_FILE \
476
       -f $CONFIGURATION_FILE \
478
       -w $FREEDOMBONE_WEBSITE \
477
       -w $FREEDOMBONE_WEBSITE \
479
       -b $FREEDOMBONE_BITMESSAGE \
478
       -b $FREEDOMBONE_BITMESSAGE \
501
 if [[ $1 == "menuconfig" ]]; then
500
 if [[ $1 == "menuconfig" ]]; then
502
   interactive_configuration
501
   interactive_configuration
503
 else
502
 else
503
+  while [[ $# > 1 ]]
504
+  do
505
+  key="$1"
504
 
506
 
505
-# Oddly it appears that command line parsing cannot be done inside of a function
506
-while [[ $# > 1 ]]
507
-do
508
-key="$1"
509
-
510
-case $key in
507
+  case $key in
511
     -h|--help)
508
     -h|--help)
512
     show_help
509
     show_help
513
     ;;
510
     ;;
648
     *)
645
     *)
649
     # unknown option
646
     # unknown option
650
     ;;
647
     ;;
651
-esac
652
-shift
653
-done
648
+  esac
649
+  shift
650
+  done
654
 fi
651
 fi
655
 
652
 
656
 function parse_args {
653
 function parse_args {

+ 1
- 2
src/freedombone-config Прегледај датотеку

136
 
136
 
137
   echo "MY_USERNAME=$MY_USERNAME" > $CONFIGURATION_FILE
137
   echo "MY_USERNAME=$MY_USERNAME" > $CONFIGURATION_FILE
138
   echo "DOMAIN_NAME=$DOMAIN_NAME" >> $CONFIGURATION_FILE
138
   echo "DOMAIN_NAME=$DOMAIN_NAME" >> $CONFIGURATION_FILE
139
-  echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE
140
   echo "SYSTEM_TYPE=$SYSTEM_TYPE" >> $CONFIGURATION_FILE
139
   echo "SYSTEM_TYPE=$SYSTEM_TYPE" >> $CONFIGURATION_FILE
141
   echo "INSTALLING_ON_BBB=$INSTALLING_ON_BBB" >> $CONFIGURATION_FILE
140
   echo "INSTALLING_ON_BBB=$INSTALLING_ON_BBB" >> $CONFIGURATION_FILE
142
   echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE
141
   echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE
143
   echo "DDNS_USERNAME=$DDNS_USERNAME" >> $CONFIGURATION_FILE
142
   echo "DDNS_USERNAME=$DDNS_USERNAME" >> $CONFIGURATION_FILE
144
-  # does this need to be saved?
145
   echo "DDNS_PASSWORD=$DDNS_PASSWORD" >> $CONFIGURATION_FILE
143
   echo "DDNS_PASSWORD=$DDNS_PASSWORD" >> $CONFIGURATION_FILE
146
   echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE
144
   echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE
145
+  echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE
147
   echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE
146
   echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE
148
   echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE
147
   echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE
149
   echo "ENABLE_CJDNS=$ENABLE_CJDNS" >> $CONFIGURATION_FILE
148
   echo "ENABLE_CJDNS=$ENABLE_CJDNS" >> $CONFIGURATION_FILE