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

Tidying

This commit is contained in:
Bob Mottram 2016-01-27 10:06:39 +00:00
parent 015ed78265
commit e1e9e5b4da
3 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone
View File

@ -948,6 +948,7 @@ function parse_args {
} }
function read_repo_servers { function read_repo_servers {
if [ -f $CONFIGURATION_FILE ]; then
if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}') FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi fi
@ -960,6 +961,7 @@ function read_repo_servers {
if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi fi
fi
if [ ! $FRIENDS_TROVE_SERVER ]; then if [ ! $FRIENDS_TROVE_SERVER ]; then
return return

2
src/freedombone-addcert
View File

@ -56,6 +56,7 @@ FRIENDS_TROVE_SSH_PORT=
MY_TROVE_PASSWORD= MY_TROVE_PASSWORD=
function read_repo_servers { function read_repo_servers {
if [ -f $CONFIGURATION_FILE ]; then
if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}') FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi fi
@ -68,6 +69,7 @@ function read_repo_servers {
if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi fi
fi
if [ ! $FRIENDS_TROVE_SERVER ]; then if [ ! $FRIENDS_TROVE_SERVER ]; then
return return

2
src/freedombone-upgrade
View File

@ -43,6 +43,7 @@ FRIENDS_TROVE_PASSWORD=
MY_TROVE_PASSWORD= MY_TROVE_PASSWORD=
function read_repo_servers { function read_repo_servers {
if [ -f $CONFIGURATION_FILE ]; then
if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}') FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi fi
@ -55,6 +56,7 @@ function read_repo_servers {
if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi fi
fi
if [ ! $FRIENDS_TROVE_SERVER ]; then if [ ! $FRIENDS_TROVE_SERVER ]; then
return return