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

24
src/freedombone
View File

@ -948,17 +948,19 @@ function parse_args {
} }
function read_repo_servers { function read_repo_servers {
if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then if [ -f $CONFIGURATION_FILE ]; then
FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
fi FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then fi
FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
fi FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then fi
MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
fi MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then fi
FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
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

24
src/freedombone-addcert
View File

@ -56,17 +56,19 @@ FRIENDS_TROVE_SSH_PORT=
MY_TROVE_PASSWORD= MY_TROVE_PASSWORD=
function read_repo_servers { function read_repo_servers {
if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then if [ -f $CONFIGURATION_FILE ]; then
FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
fi FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then fi
FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
fi FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then fi
MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
fi MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then fi
FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
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

24
src/freedombone-upgrade
View File

@ -43,17 +43,19 @@ FRIENDS_TROVE_PASSWORD=
MY_TROVE_PASSWORD= MY_TROVE_PASSWORD=
function read_repo_servers { function read_repo_servers {
if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then if [ -f $CONFIGURATION_FILE ]; then
FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
fi FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then fi
FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
fi FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then fi
MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
fi MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then fi
FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}') if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
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