From acfb092e4b1eb24b125e0c21324892ff31e9be47 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 15 Jul 2020 23:38:08 +0100 Subject: [PATCH 1/2] fix minor bug in 5.1 Signed-off-by: Adam Warner --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 28001831..5aa20187 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -72,8 +72,8 @@ useUpdateVars=false adlistFile="/etc/pihole/adlists.list" # Pi-hole needs an IP address; to begin, these variables are empty since we don't know what the IP is until # this script can run -IPV4_ADDRESS="" -IPV6_ADDRESS="" +IPV4_ADDRESS=${IPV4_ADDRESS} +IPV6_ADDRESS=${IPV6_ADDRESS} # By default, query logging is enabled and the dashboard is set to be installed QUERY_LOGGING=true INSTALL_WEB_INTERFACE=true From f50cff54de8c212a613d31b54cc736f863d4f513 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 15 Jul 2020 23:49:17 +0100 Subject: [PATCH 2/2] *innocent whistling* Signed-off-by: Adam Warner --- advanced/Scripts/piholeDebug.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh index 3d42d7e1..d5da57ae 100755 --- a/advanced/Scripts/piholeDebug.sh +++ b/advanced/Scripts/piholeDebug.sh @@ -1264,7 +1264,7 @@ upload_to_tricorder() { # If they choose no, just exit out of the script *) log_write " * Log will ${COL_GREEN}NOT${COL_NC} be uploaded to tricorder.\\n * A local copy of the debug log can be found at: ${COL_CYAN}${PIHOLE_DEBUG_LOG}${COL_NC}\\n";exit; esac - fi232623 + fi # Check if tricorder.pi-hole.net is reachable and provide token # along with some additional useful information if [[ -n "${tricorder_token}" ]]; then