Bob Mottram 8 years ago
parent
commit
e9a23cb1a9

+ 1
- 1
src/freedombone-adduser View File

@@ -34,7 +34,7 @@ PROJECT_NAME='freedombone'
34 34
 export TEXTDOMAIN=${PROJECT_NAME}-adduser
35 35
 export TEXTDOMAINDIR="/usr/share/locale"
36 36
 
37
-CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
37
+CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
38 38
 
39 39
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
40 40
 for f in $UTILS_FILES

+ 1
- 1
src/freedombone-config View File

@@ -1362,7 +1362,7 @@ function show_result {
1362 1362
 }
1363 1363
 
1364 1364
 if [ ! $CONFIGURATION_FILE ]; then
1365
-    CONFIGURATION_FILE=/root/freedombone.cfg
1365
+    CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
1366 1366
 fi
1367 1367
 
1368 1368
 read_configuration_values

+ 1
- 1
src/freedombone-controlpanel View File

@@ -81,7 +81,7 @@ WIFI_NETWORKS_FILE=~/${PROJECT_NAME}-wifi.cfg
81 81
 
82 82
 USB_DRIVE=sdb
83 83
 # get default USB from config file
84
-CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
84
+CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
85 85
 if [ -f $CONFIGURATION_FILE ]; then
86 86
     if grep -q "WIFI_HOTSPOT=" $CONFIGURATION_FILE; then
87 87
         WIFI_HOTSPOT=$(cat $CONFIGURATION_FILE | grep "WIFI_HOTSPOT=" | awk -F '=' '{print $2}')

+ 2
- 2
src/freedombone-image View File

@@ -362,8 +362,8 @@ done
362 362
 
363 363
 if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
364 364
     ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
365
-    if [ -f /root/freedombone.cfg ]; then
366
-        CONFIG_FILENAME=/root/freedombone.cfg
365
+    if [ -f $HOME/${PROJECT_NAME}.cfg ]; then
366
+        CONFIG_FILENAME=$HOME/${PROJECT_NAME}.cfg
367 367
         DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
368 368
     fi
369 369
 fi

+ 1
- 1
src/freedombone-utils-config View File

@@ -145,7 +145,7 @@ function write_config_param {
145 145
 
146 146
 function save_configuration_values {
147 147
     if [ ! $CONFIGURATION_FILE ]; then
148
-        CONFIGURATION_FILE=/root/freedombone.cfg
148
+        CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
149 149
     fi
150 150
 
151 151
     for v in "${configuration_variables[@]}"