Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-01 02:23:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed missing arguments when sudoing.

Browse source
This commit is contained in:
ryt51V 2016-03-04 10:22:26 +00:00
parent 5ecde852a0
commit 93c4525406
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
advanced/Scripts/piholeInclude
View file

@ -17,7 +17,7 @@ SUDO=""
function rerun_root() { function rerun_root() {
# Check if root, and if not then rerun with sudo. # Check if root, and if not then rerun with sudo.
# The parent script should pass its $0 and $@ to this function's $1 and $2 # The parent script should pass its $0 and $@ to this function.
echo ":::" echo ":::"
if [[ $EUID -eq 0 ]];then if [[ $EUID -eq 0 ]];then
echo "::: You are root." echo "::: You are root."
@ -26,8 +26,8 @@ function rerun_root() {
# Check if it is actually installed # Check if it is actually installed
# If it isn't, exit because the install cannot complete # If it isn't, exit because the install cannot complete
if [[ $(dpkg-query -s sudo) ]];then if [[ $(dpkg-query -s sudo) ]];then
echo "::: Running sudo $1 $2" echo "::: Running sudo $@"
sudo "$1" "$2" sudo "$@"
exit $? exit $?
else else
echo "::: Please install sudo." echo "::: Please install sudo."
@ -38,7 +38,7 @@ function rerun_root() {
function rerun_pihole() { function rerun_pihole() {
# Check if pihole user, and if not then rerun with sudo. # Check if pihole user, and if not then rerun with sudo.
# The parent script should pass its $0 and $@ to this function's $1 and $2 # The parent script should pass its $0 and $@ to this function.
echo ":::" echo ":::"
runninguser=$(whoami) runninguser=$(whoami)
if [[ "$runninguser" = "pihole" ]];then if [[ "$runninguser" = "pihole" ]];then
@ -48,8 +48,8 @@ function rerun_pihole() {
# Check if it is actually installed # Check if it is actually installed
# If it isn't, exit because the install cannot complete # If it isn't, exit because the install cannot complete
if [[ $(dpkg-query -s sudo) ]];then if [[ $(dpkg-query -s sudo) ]];then
echo "::: Running sudo -u pihole $1 $2" echo "::: Running sudo -u pihole $@"
sudo -u pihole "$1" "$2" sudo -u pihole "$@"
exit $? exit $?
else else
echo "::: Please install sudo." echo "::: Please install sudo."