From f864019e248e071de2949ea9616f426a898f3897 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 4 Jan 2019 17:03:41 +0000
Subject: [PATCH] Only change the default domain for non-onion installs
---
src/freedombone-installer | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 48b7c00c6..82917743a 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -2986,20 +2986,23 @@ function change_default_domain {
new_default_domain_name=$(cat "$default_domain_file")
rm "$default_domain_file"
- if [ "$new_default_domain_name" ]; then
- 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
+ ONION_ONLY=$(grep 'ONION_ONLY=' "$CONFIGURATION_FILE" | head -n 1 | awk -F '=' '{print $2}')
+ if [[ "$ONION_ONLY" == 'no' ]]; then
+ if [ "$new_default_domain_name" ]; then
+ 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
- # initiate an upgrade
- touch "$upgrade_file"
+ # initiate an upgrade
+ touch "$upgrade_file"
+ fi
fi
fi
fi
--
GitLab