From f0a2248c81a790c72f9ccc927627f5fcd8c4eb6a Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 15 Jul 2016 10:27:40 -0700 Subject: [PATCH 1/2] Change comment to hash Change format of comment to hash/octothorpe to clearly delineate that it's a comment. Looks better than `:::` which causes confusion. --- 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 9474d729..6424f828 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -324,7 +324,7 @@ It is also possible to use a DHCP reservation, but if you are going to do that, setDHCPCD() { # Append these lines to dhcpcd.conf to enable a static IP - echo "::: interface $piholeInterface + echo "## interface $piholeInterface static ip_address=$IPv4addr static routers=$IPv4gw static domain_name_servers=$IPv4gw" | $SUDO tee -a /etc/dhcpcd.conf >/dev/null From ce8f07750f04409bbc6354cb46dd604688dfa01b Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 15 Jul 2016 22:46:21 -0700 Subject: [PATCH 2/2] Remove trailing slash on os-release check Fixes #CLOSED Remove trailing slash that would cause an os-check to always fail out. --- 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 c5b52daf..36ae15bc 100755 --- a/advanced/Scripts/piholeDebug.sh +++ b/advanced/Scripts/piholeDebug.sh @@ -69,7 +69,7 @@ function distroCheck { echo "######## Distribution Section #########" >> $DEBUG_LOG echo "#######################################" >> $DEBUG_LOG - TMP=$(cat /etc/*release/ || echo "Failed to find release") + TMP=$(cat /etc/*release || echo "Failed to find release") echo "Distribution Version: $TMP" >> $DEBUG_LOG }