Tidying
This commit is contained in:
parent
2625f6c5aa
commit
e9a23cb1a9
|
@ -34,7 +34,7 @@ PROJECT_NAME='freedombone'
|
|||
export TEXTDOMAIN=${PROJECT_NAME}-adduser
|
||||
export TEXTDOMAINDIR="/usr/share/locale"
|
||||
|
||||
CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
|
||||
CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
|
||||
|
||||
UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
|
||||
for f in $UTILS_FILES
|
||||
|
|
|
@ -1362,7 +1362,7 @@ function show_result {
|
|||
}
|
||||
|
||||
if [ ! $CONFIGURATION_FILE ]; then
|
||||
CONFIGURATION_FILE=/root/freedombone.cfg
|
||||
CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
|
||||
fi
|
||||
|
||||
read_configuration_values
|
||||
|
|
|
@ -81,7 +81,7 @@ WIFI_NETWORKS_FILE=~/${PROJECT_NAME}-wifi.cfg
|
|||
|
||||
USB_DRIVE=sdb
|
||||
# get default USB from config file
|
||||
CONFIGURATION_FILE=/root/${PROJECT_NAME}.cfg
|
||||
CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
|
||||
if [ -f $CONFIGURATION_FILE ]; then
|
||||
if grep -q "WIFI_HOTSPOT=" $CONFIGURATION_FILE; then
|
||||
WIFI_HOTSPOT=$(cat $CONFIGURATION_FILE | grep "WIFI_HOTSPOT=" | awk -F '=' '{print $2}')
|
||||
|
|
|
@ -362,8 +362,8 @@ done
|
|||
|
||||
if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
|
||||
${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
|
||||
if [ -f /root/freedombone.cfg ]; then
|
||||
CONFIG_FILENAME=/root/freedombone.cfg
|
||||
if [ -f $HOME/${PROJECT_NAME}.cfg ]; then
|
||||
CONFIG_FILENAME=$HOME/${PROJECT_NAME}.cfg
|
||||
DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -145,7 +145,7 @@ function write_config_param {
|
|||
|
||||
function save_configuration_values {
|
||||
if [ ! $CONFIGURATION_FILE ]; then
|
||||
CONFIGURATION_FILE=/root/freedombone.cfg
|
||||
CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
|
||||
fi
|
||||
|
||||
for v in "${configuration_variables[@]}"
|
||||
|
|
Loading…
Reference in New Issue