Browse Source

Configuration file

Bob Mottram 9 years ago
parent
commit
226492bcf7
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      src/freedombone-controlpanel

+ 7
- 7
src/freedombone-controlpanel View File

35
 
35
 
36
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
36
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
37
 SELECTED_USERNAME=
37
 SELECTED_USERNAME=
38
-SIP_CONFIG_FILE=/etc/sipwitch.conf
38
+SIP_CONFIGURATION_FILE=/etc/sipwitch.conf
39
 ADMIN_USER=
39
 ADMIN_USER=
40
 UPGRADE_SCRIPT_NAME="${PROJECT_NAME}-upgrade"
40
 UPGRADE_SCRIPT_NAME="${PROJECT_NAME}-upgrade"
41
 UPDATE_DATE_SCRIPT=/usr/bin/updatedate
41
 UPDATE_DATE_SCRIPT=/usr/bin/updatedate
51
 
51
 
52
 USB_DRIVE=sdb
52
 USB_DRIVE=sdb
53
 # get default USB from config file
53
 # get default USB from config file
54
-CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg
55
-if [ -f $CONFIG_FILE ]; then
56
-    if grep -q "USB_DRIVE=" $CONFIG_FILE; then
57
-        USB_DRIVE=$(cat $CONFIG_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}')
54
+CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
55
+if [ -f $CONFIGURATION_FILE ]; then
56
+    if grep -q "USB_DRIVE=" $CONFIGURATION_FILE; then
57
+        USB_DRIVE=$(cat $CONFIGURATION_FILE | grep "USB_DRIVE=" | awk -F '=' '{print $2}')
58
         if [[ $USB_DRIVE == *"dev"* ]]; then
58
         if [[ $USB_DRIVE == *"dev"* ]]; then
59
             USB_DRIVE=$(echo ${USB_DRIVE} | awk -F '/' '{print $3}' | sed 's|1||g' | sed 's|2||g')
59
             USB_DRIVE=$(echo ${USB_DRIVE} | awk -F '/' '{print $3}' | sed 's|1||g' | sed 's|2||g')
60
         fi
60
         fi
147
 }
147
 }
148
 
148
 
149
 function show_domains {
149
 function show_domains {
150
-    DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILE | grep "DEFAULT_DOMAIN_NAME=" | awk -F '=' '{print $2}')
150
+    DEFAULT_DOMAIN_NAME=$(cat $CONFIGURATION_FILE | grep "DEFAULT_DOMAIN_NAME=" | awk -F '=' '{print $2}')
151
 
151
 
152
     echo 'Domains'
152
     echo 'Domains'
153
     echo '======='
153
     echo '======='
274
                         SIPEXT=$(echo "$ext" | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
274
                         SIPEXT=$(echo "$ext" | awk -F '>' '{print $2}' | awk -F '<' '{print $1}')
275
                     fi
275
                     fi
276
                 fi
276
                 fi
277
-            done < $SIP_CONFIG_FILE
277
+            done < $SIP_CONFIGURATION_FILE
278
             if [ $SIPEXT ]; then
278
             if [ $SIPEXT ]; then
279
                 echo -n -e "$(pad_string SIP:${SIPEXT})"
279
                 echo -n -e "$(pad_string SIP:${SIPEXT})"
280
             else
280
             else