Merge pull request #805 from pi-hole/development

Hotfix for installer bug, MASTER
Merge branch 'master' into development
2016-10-17 22:41:02 -05:00 · 2016-10-17 19:57:05 -07:00 · 2016-10-17 19:27:46 -07:00 · 2016-10-17 19:22:56 -07:00 · 2016-10-17 22:24:59 +01:00
2 changed files with 2 additions and 2 deletions
--- a/install/basic-install.sh
+++ b/install/basic-install.sh
@@ -58,7 +58,7 @@ else
  echo "::: Detecting the presence of the sudo utility for continuation of this install..."
 	if [ -x "$(command -v sudo)" ];then
 		echo "::: Utility sudo located."
-	  exec sudo bash "$0" "$@"
+	  exec curl -sSL https://install.pi-hole.net | sudo bash "$@"
    exit $?
 	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."
--- a/gravity.sh
+++ b/gravity.sh
@@ -37,7 +37,7 @@ if [[ -f ${setupVars} ]];then
    . /etc/pihole/setupVars.conf
 else
    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
 fi
Author	SHA1	Message	Date
Jacob Salmela	fc89851ce9	Merge pull request #805 from pi-hole/development Hotfix for installer bug, MASTER	2016-10-17 22:41:02 -05:00
Dan Schaper	c4c6555814	Merge branch 'master' into development	2016-10-17 19:57:05 -07:00
Dan Schaper	df0087fb23	Merge pull request #804 from pi-hole/hotfix/curlRefire Refire with curl	2016-10-17 19:27:46 -07:00
Dan Schaper	ef3c13fe2b	Refire with curl	2016-10-17 19:22:56 -07:00
Promofaux	49f48e2aaa	wrong word. #admincrimes	2016-10-17 22:24:59 +01:00