From 33156071cd189c26a12ef9253f84118b02e0939b Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 8 Nov 2018 19:43:35 +0100 Subject: [PATCH 1/2] Fix literal "choice" being passed to appendToListsFile() Signed-off-by: DL6ER --- 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 b25268b6..c8a29a09 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1132,7 +1132,7 @@ chooseBlocklists() { # For each choice available, for choice in ${choices} do - appendToListsFile choice + appendToListsFile "${choice}" done } From 057fbfc2b9c5184bdcbf035cbe89475938f905cb Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 8 Nov 2018 11:10:09 -0800 Subject: [PATCH 2/2] Change field from digit to string for printf Signed-off-by: Dan Schaper --- 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 b25268b6..8727cadc 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -617,7 +617,7 @@ chooseInterface() { # See https://github.com/pi-hole/pi-hole/issues/1473#issuecomment-301745953 testIPv6() { # first will contain fda2 (ULA) - printf -v first "%d" "${1%%:*}" + printf -v first "%s" "${1%%:*}" # value1 will contain 253 which is the decimal value corresponding to 0xfd value1=$(( (0x$first)/256 )) # will contain 162 which is the decimal value corresponding to 0xa2