From ec8c848106841c0e7900d7772025c99c30364d3f Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 12:53:00 +0100 Subject: [PATCH 1/3] Don't kill already existing setupVars.conf on update (and fresh install) --- automated install/basic-install.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 9464d03b..4744d7d5 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -872,10 +872,8 @@ configureFirewall() { } finalExports() { - #If it already exists, lets overwrite it with the new values. - if [[ -f ${setupVars} ]]; then - rm ${setupVars} - fi + # Update variables in setupVars.conf file + sed -i.update.bak '/PIHOLE_DOMAIN/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;' "${setupVars}" { echo "PIHOLE_INTERFACE=${PIHOLE_INTERFACE}" echo "IPV4_ADDRESS=${IPV4_ADDRESS}" From 7872f68a45145b713971bab9af6cc56860a8fbf6 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 13:13:35 +0100 Subject: [PATCH 2/3] Only try to remove parts inthe file if the file already exists --- automated install/basic-install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 4744d7d5..0e82cb31 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -873,7 +873,9 @@ configureFirewall() { finalExports() { # Update variables in setupVars.conf file - sed -i.update.bak '/PIHOLE_DOMAIN/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;' "${setupVars}" + if [ -e "${setupVars}" ]; then + sed -i.update.bak '/PIHOLE_DOMAIN/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;' "${setupVars}" + fi { echo "PIHOLE_INTERFACE=${PIHOLE_INTERFACE}" echo "IPV4_ADDRESS=${IPV4_ADDRESS}" From d4c378ed5d1b0c21af598c12b2013547469b97f7 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 16 Dec 2016 13:20:25 +0100 Subject: [PATCH 3/3] Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN) --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 0e82cb31..4671f49e 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -874,7 +874,7 @@ configureFirewall() { finalExports() { # Update variables in setupVars.conf file if [ -e "${setupVars}" ]; then - sed -i.update.bak '/PIHOLE_DOMAIN/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;' "${setupVars}" + sed -i.update.bak '/PIHOLE_INTERFACE/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1/d;/PIHOLE_DNS_2/d;/QUERY_LOGGING/d;' "${setupVars}" fi { echo "PIHOLE_INTERFACE=${PIHOLE_INTERFACE}"