From e1e9e5b4da6244231c6b741fe6537d1904cc7d94 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Wed, 27 Jan 2016 10:06:39 +0000
Subject: [PATCH] Tidying
---
src/freedombone | 24 +++++++++++++-----------
src/freedombone-addcert | 24 +++++++++++++-----------
src/freedombone-upgrade | 24 +++++++++++++-----------
3 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/src/freedombone b/src/freedombone
index 629ff592f..eea38c5c3 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -948,17 +948,19 @@ function parse_args {
}
function read_repo_servers {
- if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
- MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ if [ -f $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}')
+ fi
+ if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
+ FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
+ if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+ MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
+ if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+ FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
fi
if [ ! $FRIENDS_TROVE_SERVER ]; then
diff --git a/src/freedombone-addcert b/src/freedombone-addcert
index f5e1185d3..4b48ceba8 100755
--- a/src/freedombone-addcert
+++ b/src/freedombone-addcert
@@ -56,17 +56,19 @@ FRIENDS_TROVE_SSH_PORT=
MY_TROVE_PASSWORD=
function read_repo_servers {
- if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
- MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ if [ -f $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}')
+ fi
+ if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
+ FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
+ if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+ MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
+ if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+ FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
fi
if [ ! $FRIENDS_TROVE_SERVER ]; then
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index c60a14a3c..dcdab573f 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -43,17 +43,19 @@ FRIENDS_TROVE_PASSWORD=
MY_TROVE_PASSWORD=
function read_repo_servers {
- if grep -q "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_SERVER=$(grep "FRIENDS_TROVE_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
- MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
- if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
- FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ if [ -f $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}')
+ fi
+ if grep -q "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE; then
+ FRIENDS_TROVE_SSH_PORT=$(grep "FRIENDS_TROVE_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
+ if grep -q "MY_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+ MY_TROVE_PASSWORD=$(grep "MY_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
+ if grep -q "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE; then
+ FRIENDS_TROVE_PASSWORD=$(grep "FRIENDS_TROVE_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ fi
fi
if [ ! $FRIENDS_TROVE_SERVER ]; then
--
GitLab