free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

This commit is contained in:
Bob Mottram 2015-02-01 18:19:11 +00:00
parent f790606705
commit e74fce956b
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/freedombone
View File

@ -473,7 +473,6 @@ function interactive_configuration {
fi fi
freedombone-config \ freedombone-config \
-u $MY_USERNAME \
-f $CONFIGURATION_FILE \ -f $CONFIGURATION_FILE \
-w $FREEDOMBONE_WEBSITE \ -w $FREEDOMBONE_WEBSITE \
-b $FREEDOMBONE_BITMESSAGE \ -b $FREEDOMBONE_BITMESSAGE \
@ -501,13 +500,11 @@ function interactive_configuration {
if [[ $1 == "menuconfig" ]]; then if [[ $1 == "menuconfig" ]]; then
interactive_configuration interactive_configuration
else else
while [[ $# > 1 ]]
do
key="$1"
# Oddly it appears that command line parsing cannot be done inside of a function case $key in
while [[ $# > 1 ]]
do
key="$1"
case $key in
-h|--help) -h|--help)
show_help show_help
;; ;;
@ -648,9 +645,9 @@ case $key in
*) *)
# unknown option # unknown option
;; ;;
esac esac
shift shift
done done
fi fi
function parse_args { function parse_args {

3
src/freedombone-config
View File

@ -136,14 +136,13 @@ function save_configuration_file {
echo "MY_USERNAME=$MY_USERNAME" > $CONFIGURATION_FILE echo "MY_USERNAME=$MY_USERNAME" > $CONFIGURATION_FILE
echo "DOMAIN_NAME=$DOMAIN_NAME" >> $CONFIGURATION_FILE echo "DOMAIN_NAME=$DOMAIN_NAME" >> $CONFIGURATION_FILE
echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE
echo "SYSTEM_TYPE=$SYSTEM_TYPE" >> $CONFIGURATION_FILE echo "SYSTEM_TYPE=$SYSTEM_TYPE" >> $CONFIGURATION_FILE
echo "INSTALLING_ON_BBB=$INSTALLING_ON_BBB" >> $CONFIGURATION_FILE echo "INSTALLING_ON_BBB=$INSTALLING_ON_BBB" >> $CONFIGURATION_FILE
echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE
echo "DDNS_USERNAME=$DDNS_USERNAME" >> $CONFIGURATION_FILE echo "DDNS_USERNAME=$DDNS_USERNAME" >> $CONFIGURATION_FILE
# does this need to be saved?
echo "DDNS_PASSWORD=$DDNS_PASSWORD" >> $CONFIGURATION_FILE echo "DDNS_PASSWORD=$DDNS_PASSWORD" >> $CONFIGURATION_FILE
echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE
echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE
echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE
echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE
echo "ENABLE_CJDNS=$ENABLE_CJDNS" >> $CONFIGURATION_FILE echo "ENABLE_CJDNS=$ENABLE_CJDNS" >> $CONFIGURATION_FILE