Merge pull request #805 from pi-hole/development

Hotfix for installer bug, MASTER
This commit is contained in:
Jacob Salmela 2016-10-17 22:41:02 -05:00 committed by GitHub
commit fc89851ce9
2 changed files with 2 additions and 2 deletions

View file

@ -58,7 +58,7 @@ else
echo "::: Detecting the presence of the sudo utility for continuation of this install..." echo "::: Detecting the presence of the sudo utility for continuation of this install..."
if [ -x "$(command -v sudo)" ];then if [ -x "$(command -v sudo)" ];then
echo "::: Utility sudo located." echo "::: Utility sudo located."
exec sudo bash "$0" "$@" exec curl -sSL https://install.pi-hole.net | sudo bash "$@"
exit $? exit $?
else else
echo "::: sudo is needed for the Web interface to run pihole commands. Please run this script as root and it will be automatically installed." echo "::: sudo is needed for the Web interface to run pihole commands. Please run this script as root and it will be automatically installed."

View file

@ -37,7 +37,7 @@ if [[ -f ${setupVars} ]];then
. /etc/pihole/setupVars.conf . /etc/pihole/setupVars.conf
else else
echo "::: WARNING: /etc/pihole/setupVars.conf missing. Possible installation failure." echo "::: WARNING: /etc/pihole/setupVars.conf missing. Possible installation failure."
echo "::: Please run 'pihole -r', and choose the 'install' option to reconfigure." echo "::: Please run 'pihole -r', and choose the 'reconfigure' option to reconfigure."
exit 1 exit 1
fi fi