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

Merge branch 'stockholm' of https://github.com/bashrc/freedombone into stockholm

This commit is contained in:
Bob Mottram 2016-07-20 19:13:49 +01:00
parent 2d0aeffc0f 53d1ec4b21
commit 2fa22c4d04
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedombone-config
View File

@ -788,7 +788,7 @@ function select_user {
fi fi
} }
function interactive_configuration { function interactive_config {
# create a temporary copy of the configuration file # create a temporary copy of the configuration file
# which can be used to pre-populate selections # which can be used to pre-populate selections
if [ -f $CONFIGURATION_FILE ]; then if [ -f $CONFIGURATION_FILE ]; then
@ -2192,6 +2192,6 @@ function read_configuration {
} }
read_configuration read_configuration
interactive_configuration interactive_config
show_result show_result
exit 0 exit 0

4
src/freedombone-remote
View File

@ -116,7 +116,7 @@ do
shift shift
done done
function interactive_configuration_remote_backups { function interactive_config_remote_backups {
if [ ! $MY_USERNAME ]; then if [ ! $MY_USERNAME ]; then
echo $'Please specify a username with the -u option' echo $'Please specify a username with the -u option'
exit 7356 exit 7356
@ -259,6 +259,6 @@ if [ ! $FRIENDS_SERVERS_LIST ]; then
FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
fi fi
interactive_configuration_remote_backups interactive_config_remote_backups
show_result show_result
exit 0 exit 0