From 1d5c4d9849cbe5ec2eda2f147ef9c8d712eeee4d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 4 Jan 2019 17:05:17 +0000
Subject: [PATCH] Check whether the default domain name has changed
---
src/freedombone-installer | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 82917743a..f0632d950 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -2992,15 +2992,18 @@ function change_default_domain {
if [ ${#new_default_domain_name} -gt 5 ]; then
if [[ "$new_default_domain_name" == *'.'* ]]; then
- # set the new default domain within the config file
- if ! grep -q "NEW_DEFAULT_DOMAIN_NAME=" $CONFIGURATION_FILE; then
- echo "NEW_DEFAULT_DOMAIN_NAME=$new_default_domain_name" >> $CONFIGURATION_FILE
- else
- sed -i "s|NEW_DEFAULT_DOMAIN_NAME=.*|NEW_DEFAULT_DOMAIN_NAME=$new_default_domain_name|g" $CONFIGURATION_FILE
- fi
+ DEFAULT_DOMAIN_NAME=$(grep 'DEFAULT_DOMAIN_NAME=' "$CONFIGURATION_FILE" | head -n 1 | awk -F '=' '{print $2}')
+ if [[ "$DEFAULT_DOMAIN_NAME" != "$new_default_domain_name" ]]; then
+ # set the new default domain within the config file
+ if ! grep -q "NEW_DEFAULT_DOMAIN_NAME=" $CONFIGURATION_FILE; then
+ echo "NEW_DEFAULT_DOMAIN_NAME=$new_default_domain_name" >> $CONFIGURATION_FILE
+ else
+ sed -i "s|NEW_DEFAULT_DOMAIN_NAME=.*|NEW_DEFAULT_DOMAIN_NAME=$new_default_domain_name|g" $CONFIGURATION_FILE
+ fi
- # initiate an upgrade
- touch "$upgrade_file"
+ # initiate an upgrade
+ touch "$upgrade_file"
+ fi
fi
fi
--
GitLab