From edb594461d3ac683934eb9b256d93946f92823ad Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 28 Jun 2017 22:54:02 +0100 Subject: [PATCH] Remove CIDR from IPv6 address when detecting it in the install script Signed-off-by: Adam Warner # Conflicts: # automated install/basic-install.sh --- automated install/basic-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 053e04ba..2cf2c61d 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -344,8 +344,8 @@ useIPv6dialog() { # Determine type of found IPv6 addresses for i in "${IPV6_ADDRESSES[@]}"; do result=$(testIPv6 "$i") - [[ "${result}" == "ULA" ]] && ULA_ADDRESS="$i" - [[ "${result}" == "GUA" ]] && GUA_ADDRESS="$i" + [[ "${result}" == "ULA" ]] && ULA_ADDRESS="${i%/*}" + [[ "${result}" == "GUA" ]] && GUA_ADDRESS="${i%/*}" done # Determine which address to be used: Prefer ULA over GUA or don't use any if none found @@ -1510,10 +1510,9 @@ main() { else echo "::: Update complete!" fi - if [[ ${INSTALL_WEB} == true ]]; then if (( ${#pw} > 0 )) ; then - echo ":::" + echo ":::" echo "::: Note: As security measure a password has been installed for your web interface" echo "::: The currently set password is" echo "::: ${pw}" @@ -1524,7 +1523,8 @@ main() { fi echo ":::" - echo "::: The install log is located at: /etc/pihole/install.log" + echo "::: The install log is located at: /etc/pihole/install.log + " } if [[ "${PH_TEST}" != true ]] ; then