From 784c5722792b89f248e94b28b449c09f003eb1a7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 13 Oct 2016 22:26:09 +0100
Subject: [PATCH] Tidying mirrors

---
 src/freedombone-mirrors | 49 +++++++++++------------------------------
 src/freedombone-upgrade |  4 ++--
 2 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/src/freedombone-mirrors b/src/freedombone-mirrors
index 705896ca..6ebb8614 100755
--- a/src/freedombone-mirrors
+++ b/src/freedombone-mirrors
@@ -51,24 +51,19 @@ if [ ! -f $MAIN_COMMAND ]; then
     MAIN_COMMAND=/usr/bin/${PROJECT_NAME}
 fi
 
-REPOS=($(cat ${MAIN_COMMAND} /usr/share/${PROJECT_NAME}/utils/${MAIN_COMMAND}-utils-* /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-* | grep "_REPO=\"" | grep -v "(cat " | uniq -u | sed 's|${PROJECT_NAME}|'"${PROJECT_NAME}"'|g'))
+REPOS=($(cat ${MAIN_COMMAND} /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-* /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-* | grep "_REPO=\"" | grep -v "(cat " | uniq -u | sed 's|${PROJECT_NAME}|'"${PROJECT_NAME}"'|g'))
 
+UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
+for f in $UTILS_FILES
+do
+  source $f
+done
 
 # obtain the mirrors password if it exists
-if [ -f $CONFIGURATION_FILE ]; then
-    if ! grep -q "MY_MIRRORS_PASSWORD" $CONFIGURATION_FILE; then
-        MY_MIRRORS_PASSWORD=$(grep "MY_MIRRORS_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if ! grep -q "FRIENDS_MIRRORS_SERVER" $CONFIGURATION_FILE; then
-        FRIENDS_MIRRORS_SERVER=$(grep "FRIENDS_MIRRORS_SERVER" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if ! grep -q "FRIENDS_MIRRORS_PASSWORD" $CONFIGURATION_FILE; then
-        FRIENDS_MIRRORS_PASSWORD=$(grep "FRIENDS_MIRRORS_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-    if ! grep -q "FRIENDS_MIRRORS_SSH_PORT" $CONFIGURATION_FILE; then
-        FRIENDS_MIRRORS_SSH_PORT=$(grep "FRIENDS_MIRRORS_SSH_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-    fi
-fi
+read_config_param MY_MIRRORS_PASSWORD
+read_config_param FRIENDS_MIRRORS_SERVER
+read_config_param FRIENDS_MIRRORS_PASSWORD
+read_config_param FRIENDS_MIRRORS_SSH_PORT
 
 function show_help {
     echo ''
@@ -106,13 +101,7 @@ function create_mirrors_user {
     rm -rf /home/mirrors/*
 
     # store the mirrors password
-    if [ -f $CONFIGURATION_FILE ]; then
-        if ! grep -q "MY_MIRRORS_PASSWORD" $CONFIGURATION_FILE; then
-            echo "MY_MIRRORS_PASSWORD=$MY_MIRRORS_PASSWORD" >> $CONFIGURATION_FILE
-        else
-            sed -i "s|MY_MIRRORS_PASSWORD=.*|MY_MIRRORS_PASSWORD=${MY_MIRRORS_PASSWORD}|g" $CONFIGURATION_FILE
-        fi
-    fi
+    write_config_param "MY_MIRRORS_PASSWORD" "${MY_MIRRORS_PASSWORD}"
 }
 
 function enable_mirrors_via_onion {
@@ -199,24 +188,12 @@ case $key in
     -m|--mypass|--mypassword)
     shift
     MY_MIRRORS_PASSWORD="$1"
-    if [ -f $CONFIGURATION_FILE ]; then
-        if ! grep -q "MY_MIRRORS_PASSWORD" $CONFIGURATION_FILE; then
-            echo "MY_MIRRORS_PASSWORD=$MY_MIRRORS_PASSWORD" >> $CONFIGURATION_FILE
-        else
-            sed -i "s|MY_MIRRORS_PASSWORD=.*|MY_MIRRORS_PASSWORD=${MY_MIRRORS_PASSWORD}|g" $CONFIGURATION_FILE
-        fi
-    fi
+    write_config_param "MY_MIRRORS_PASSWORD" "${MY_MIRRORS_PASSWORD}"
     ;;
     -p|--pass|--password)
     shift
     FRIENDS_MIRRORS_PASSWORD="$1"
-    if [ -f $CONFIGURATION_FILE ]; then
-        if ! grep -q "FRIENDS_MIRRORS_PASSWORD" $CONFIGURATION_FILE; then
-            echo "FRIENDS_MIRRORS_PASSWORD=$FRIENDS_MIRRORS_PASSWORD" >> $CONFIGURATION_FILE
-        else
-            sed -i "s|FRIENDS_MIRRORS_PASSWORD=.*|FRIENDS_MIRRORS_PASSWORD=${FRIENDS_MIRRORS_PASSWORD}|g" $CONFIGURATION_FILE
-        fi
-    fi
+    write_config_param "FRIENDS_MIRRORS_PASSWORD" "${FRIENDS_MIRRORS_PASSWORD}"
     ;;
     -n|--new)
     shift
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 9b305b4e..39c637f6 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -30,10 +30,10 @@
 
 PROJECT_NAME='freedombone'
 
-PROJECT_DIR="/root/${PROJECT_NAME}"
+PROJECT_DIR="$HOME/${PROJECT_NAME}"
 
 # An optional configuration file which overrides some of these variables
-CONFIGURATION_FILE="/root/${PROJECT_NAME}.cfg"
+CONFIGURATION_FILE="$HOME/${PROJECT_NAME}.cfg"
 
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"