From 7bac22dbf7387ce179496e747ff703f66a74990d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 10 Oct 2016 14:21:08 +0100
Subject: [PATCH] Reading the project repo
---
src/freedombone-image | 7 +++++++
src/freedombone-upgrade | 8 +-------
src/freedombone-utils-setup | 3 +++
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/freedombone-image b/src/freedombone-image
index e196d25bd..647f2c746 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -35,7 +35,14 @@ PROJECT_NAME='freedombone'
export TEXTDOMAIN=${PROJECT_NAME}-image
export TEXTDOMAINDIR="/usr/share/locale"
+#get the project repo
PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
+UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
+for f in $UTILS_FILES
+do
+ source $f
+done
+read_config_param PROJECT_REPO
# recommended RAM for virtual machines
VM_MEMORY='1G'
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 4ddcf4ea8..9b305b4e9 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -47,13 +47,7 @@ for f in $UTILS_FILES
do
source $f
done
-
-if [ -f $CONFIGURATION_FILE ]; then
- # read the location of the main project repo
- if grep -q "PROJECT_REPO" $CONFIGURATION_FILE; then
- PROJECT_REPO=$(grep "PROJECT_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
- fi
-fi
+read_config_param PROJECT_REPO
update-ca-certificates
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index ba39fd557..dfabf073b 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -257,6 +257,9 @@ function setup_firewall {
}
function setup_utils {
+ read_config_param "PROJECT_REPO"
+ write_config_param "PROJECT_REPO" "$PROJECT_REPO"
+
function_check create_completion_file
create_completion_file
--
GitLab