From 96d2a1abfc70d719ad6a3d492120f13ad584f8d9 Mon Sep 17 00:00:00 2001 From: J den Hartog Date: Sun, 1 Oct 2017 19:40:45 +0200 Subject: [PATCH 1/3] Added "-sn Run speediest now" to helpFunc() --- advanced/Scripts/webpage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 6e630115..ca8aecfa 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -33,6 +33,7 @@ Options: -s, speedtest Set speedtest intevel , user 0 to disable Speedtests use -sn to prevent logging to results list -sd Set speedtest display range + -sn Run speedtest now -sc Clear speedtest data -ss Set custom server" From 8418f7f54b692e15734f1cd5cf11d3718a74dcc0 Mon Sep 17 00:00:00 2001 From: Siddhu Arevindh Date: Mon, 2 Oct 2017 12:50:34 +0530 Subject: [PATCH 2/3] Update basic-install.sh --- automated install/basic-install.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 2cf2c61d..6ebe4935 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -23,9 +23,9 @@ instalLogLoc=/etc/pihole/install.log setupVars=/etc/pihole/setupVars.conf lighttpdConfig=/etc/lighttpd/lighttpd.conf -webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git" +webInterfaceGitUrl="https://github.com/arevindh/AdminLTE.git" webInterfaceDir="/var/www/html/admin" -piholeGitUrl="https://github.com/pi-hole/pi-hole.git" +piholeGitUrl="https://github.com/arevindh/pi-hole.git" PI_HOLE_LOCAL_REPO="/etc/.pihole" PI_HOLE_FILES=(chronometer list piholeDebug piholeLogFlush setupLCD update version gravity uninstall webpage) PI_HOLE_INSTALL_DIR="/opt/pihole" @@ -249,7 +249,10 @@ get_available_interfaces() { welcomeDialogs() { # Display the welcome dialog whiptail --msgbox --backtitle "Welcome" --title "Pi-hole automated installer" "\n\nThis installer will transform your device into a network-wide ad blocker!" ${r} ${c} - + + #Display speedtest mod dialog + whiptail --msgbox --backtitle "Speedtest Mod" --title "Speedtest Mod Included" "\n\nSpeedtestMod faq @ https://goo.gl/7FSZ43" ${r} ${c} + # Support for a part-time dev whiptail --msgbox --backtitle "Plea" --title "Free and open source" "\n\nThe Pi-hole is free, but powered by your donations: http://pi-hole.net/donate" ${r} ${c} From dcf6cd8f7e01494fc06bc2bd5de286bc51093a1d Mon Sep 17 00:00:00 2001 From: Siddhu Arevindh Date: Mon, 2 Oct 2017 13:00:21 +0530 Subject: [PATCH 3/3] Fixed URL Fixed URL to current repo --- 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 6ebe4935..4a43fbf1 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1362,7 +1362,7 @@ main() { if command -v sudo &> /dev/null; then echo "::: Utility sudo located." - exec curl -sSL https://raw.githubusercontent.com/pi-hole/pi-hole/master/automated%20install/basic-install.sh | sudo bash "$@" + exec curl -sSL https://raw.githubusercontent.com/arevindh/pi-hole/master/automated%20install/basic-install.sh | 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."