From 4c890ab2022e2adfbe368ee02c643947cd812bac Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 13 Apr 2016 15:50:48 +0100 Subject: [PATCH 1/5] Add root check to blacklist script --- advanced/Scripts/blacklist.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh index aa98f011..c178d9a1 100755 --- a/advanced/Scripts/blacklist.sh +++ b/advanced/Scripts/blacklist.sh @@ -10,6 +10,21 @@ # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. +#rootcheck +if [[ $EUID -eq 0 ]];then + echo "::: You are root." +else + echo "::: sudo will be used." + # Check if it is actually installed + # If it isn't, exit because the install cannot complete + if [[ $(dpkg-query -s sudo) ]];then + export SUDO="sudo" + else + echo "::: Please install sudo or run this script as root." + exit 1 + fi +fi + if [[ $# = 0 ]]; then helpFunc fi @@ -54,7 +69,7 @@ function helpFunc() echo "::: Immediately blacklists one or more domains in the hosts file" echo ":::" echo ":::" - echo "::: Usage: sudo pihole -b domain1 [domain2 ...]" + echo "::: Usage: pihole -b domain1 [domain2 ...]" echo "::: Options:" echo "::: -d, --delmode Remove domains from the blacklist" echo "::: -nr, --noreload Update blacklist without refreshing dnsmasq" @@ -166,10 +181,10 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - sudo kill -HUP "$dnsmasqPid" + $SUDO kill -HUP "$dnsmasqPid" else # service not running, start it up - sudo service dnsmasq start + $SUDO service dnsmasq start fi echo " done!" } From 77f4126f9b06596f967d4dd61fd0c3c823b95244 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 13 Apr 2016 15:51:48 +0100 Subject: [PATCH 2/5] add root check to whitelist script --- advanced/Scripts/whitelist.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh index e69e8804..651ff4d4 100755 --- a/advanced/Scripts/whitelist.sh +++ b/advanced/Scripts/whitelist.sh @@ -10,6 +10,21 @@ # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. +#rootcheck +if [[ $EUID -eq 0 ]];then + echo "::: You are root." +else + echo "::: sudo will be used." + # Check if it is actually installed + # If it isn't, exit because the install cannot complete + if [[ $(dpkg-query -s sudo) ]];then + export SUDO="sudo" + else + echo "::: Please install sudo or run this script as root." + exit 1 + fi +fi + if [[ $# = 0 ]]; then helpFunc fi @@ -52,7 +67,7 @@ function helpFunc() { echo "::: Immediately whitelists one or more domains in the hosts file" echo ":::" - echo "::: Usage: sudo pihole -w domain1 [domain2 ...]" + echo "::: Usage: pihole -w domain1 [domain2 ...]" echo ":::" echo "::: Options:" echo "::: -d, --delmode Remove domains from the whitelist" @@ -179,10 +194,10 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - sudo kill -HUP "$dnsmasqPid" + $SUDO kill -HUP "$dnsmasqPid" else # service not running, start it up - sudo service dnsmasq start + $SUDO service dnsmasq start fi echo " done!" } From 3d4bff9414342cb20380749bf1509dc744491e55 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Sat, 16 Apr 2016 10:56:49 +0100 Subject: [PATCH 3/5] Add -s switch to kill command to increase compatability --- advanced/Scripts/blacklist.sh | 2 +- advanced/Scripts/whitelist.sh | 2 +- gravity.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh index c178d9a1..a2f71db7 100755 --- a/advanced/Scripts/blacklist.sh +++ b/advanced/Scripts/blacklist.sh @@ -181,7 +181,7 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -HUP "$dnsmasqPid" + $SUDO kill -s HUP "$dnsmasqPid" else # service not running, start it up $SUDO service dnsmasq start diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh index 651ff4d4..801ab9a2 100755 --- a/advanced/Scripts/whitelist.sh +++ b/advanced/Scripts/whitelist.sh @@ -194,7 +194,7 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -HUP "$dnsmasqPid" + $SUDO kill -s HUP "$dnsmasqPid" else # service not running, start it up $SUDO service dnsmasq start diff --git a/gravity.sh b/gravity.sh index ac9cd629..1a45de45 100755 --- a/gravity.sh +++ b/gravity.sh @@ -320,7 +320,7 @@ function gravity_reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -HUP "$dnsmasqPid" + $SUDO kill -s HUP "$dnsmasqPid" else # service not running, start it up $SUDO service dnsmasq start From 4941a657bf9e1abfa27df85a4f79981afc03a6ac Mon Sep 17 00:00:00 2001 From: Promofaux Date: Sat, 16 Apr 2016 12:59:40 +0100 Subject: [PATCH 4/5] remove -s switch, as it turns out it worked afterall. --- advanced/Scripts/blacklist.sh | 2 +- advanced/Scripts/whitelist.sh | 2 +- gravity.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh index a2f71db7..c178d9a1 100755 --- a/advanced/Scripts/blacklist.sh +++ b/advanced/Scripts/blacklist.sh @@ -181,7 +181,7 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -s HUP "$dnsmasqPid" + $SUDO kill -HUP "$dnsmasqPid" else # service not running, start it up $SUDO service dnsmasq start diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh index 801ab9a2..651ff4d4 100755 --- a/advanced/Scripts/whitelist.sh +++ b/advanced/Scripts/whitelist.sh @@ -194,7 +194,7 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -s HUP "$dnsmasqPid" + $SUDO kill -HUP "$dnsmasqPid" else # service not running, start it up $SUDO service dnsmasq start diff --git a/gravity.sh b/gravity.sh index 1a45de45..ac9cd629 100755 --- a/gravity.sh +++ b/gravity.sh @@ -320,7 +320,7 @@ function gravity_reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -s HUP "$dnsmasqPid" + $SUDO kill -HUP "$dnsmasqPid" else # service not running, start it up $SUDO service dnsmasq start From ad574f5e9084f65a1b5450bb95807f035174de5e Mon Sep 17 00:00:00 2001 From: Promofaux Date: Sat, 16 Apr 2016 15:52:38 +0100 Subject: [PATCH 5/5] Replace kill with killall --- advanced/Scripts/blacklist.sh | 2 +- advanced/Scripts/whitelist.sh | 2 +- gravity.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh index c178d9a1..033289ba 100755 --- a/advanced/Scripts/blacklist.sh +++ b/advanced/Scripts/blacklist.sh @@ -181,7 +181,7 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -HUP "$dnsmasqPid" + $SUDO killall -s HUP dnsmasq else # service not running, start it up $SUDO service dnsmasq start diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh index 651ff4d4..a525b24a 100755 --- a/advanced/Scripts/whitelist.sh +++ b/advanced/Scripts/whitelist.sh @@ -194,7 +194,7 @@ function Reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -HUP "$dnsmasqPid" + $SUDO killall -s HUP dnsmasq else # service not running, start it up $SUDO service dnsmasq start diff --git a/gravity.sh b/gravity.sh index ac9cd629..ffcbf342 100755 --- a/gravity.sh +++ b/gravity.sh @@ -320,7 +320,7 @@ function gravity_reload() { if [[ $dnsmasqPid ]]; then # service already running - reload config - $SUDO kill -HUP "$dnsmasqPid" + $SUDO killall -s HUP dnsmasq else # service not running, start it up $SUDO service dnsmasq start