Bob Mottram 8 年前
父节点
当前提交
e9a23cb1a9
共有 5 个文件被更改,包括 6 次插入6 次删除
  1. 1
    1
      src/freedombone-adduser
  2. 1
    1
      src/freedombone-config
  3. 1
    1
      src/freedombone-controlpanel
  4. 2
    2
      src/freedombone-image
  5. 1
    1
      src/freedombone-utils-config

+ 1
- 1
src/freedombone-adduser 查看文件

34
 export TEXTDOMAIN=${PROJECT_NAME}-adduser
34
 export TEXTDOMAIN=${PROJECT_NAME}-adduser
35
 export TEXTDOMAINDIR="/usr/share/locale"
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
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
39
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
40
 for f in $UTILS_FILES
40
 for f in $UTILS_FILES

+ 1
- 1
src/freedombone-config 查看文件

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

+ 1
- 1
src/freedombone-controlpanel 查看文件

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

+ 2
- 2
src/freedombone-image 查看文件

362
 
362
 
363
 if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
363
 if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
364
     ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
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
         DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
367
         DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
368
     fi
368
     fi
369
 fi
369
 fi

+ 1
- 1
src/freedombone-utils-config 查看文件

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