Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-10 17:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix on merge conflict

Browse source
This commit is contained in:
Siddhu 2017-12-08 00:31:16 +05:30
parent a436d55f23
commit 3e246f99ca
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
advanced/Scripts/webpage.sh
View file

@ -37,7 +37,6 @@ Options:
-e, email Set an administrative contact address for the Block Page -e, email Set an administrative contact address for the Block Page
-h, --help Show this help dialog -h, --help Show this help dialog
-i, interface Specify dnsmasq's interface listening behavior -i, interface Specify dnsmasq's interface listening behavior
<<<<<<< HEAD
Add '-h' for more info on interface usage Add '-h' for more info on interface usage
-s, speedtest Set speedtest intevel , user 0 to disable Speedtests -s, speedtest Set speedtest intevel , user 0 to disable Speedtests
use -sn to prevent logging to results list use -sn to prevent logging to results list
@ -45,9 +44,6 @@ Options:
-sc Clear speedtest data -sc Clear speedtest data
-ss Set custom server" -ss Set custom server"
=======
Add '-h' for more info on interface usage"
>>>>>>> 5ba413569ea8a4220c7e3bd2fa8c28b33b9e8492
exit 0 exit 0
} }
@ -108,7 +104,7 @@ SetWebPassword() {
# Prevents a bug if the user presses Ctrl+C and it continues to hide the text typed. # Prevents a bug if the user presses Ctrl+C and it continues to hide the text typed.
# So we reset the terminal via stty if the user does press Ctrl+C # So we reset the terminal via stty if the user does press Ctrl+C
trap '{ echo -e "\nNo password will be set" ; stty sane ; exit 1; }' INT trap '{ echo -e "\nNo password will be set" ; stty sane ; exit 1; }' INT
read -s -p "Enter New Password \(Blank for no password\): " PASSWORD read -s -p "Enter New Password (Blank for no password): " PASSWORD
echo "" echo ""
if [ "${PASSWORD}" == "" ]; then if [ "${PASSWORD}" == "" ]; then
@ -603,13 +599,16 @@ main() {
"-i" | "interface" ) SetListeningMode "$@";; "-i" | "interface" ) SetListeningMode "$@";;
"-t" | "teleporter" ) Teleporter;; "-t" | "teleporter" ) Teleporter;;
"adlist" ) CustomizeAdLists;; "adlist" ) CustomizeAdLists;;
<<<<<<< HEAD
"-s" | "speedtest" ) ChageSpeedTestSchedule;; "-s" | "speedtest" ) ChageSpeedTestSchedule;;
"-sd" ) UpdateSpeedTestRange;; "-sd" ) UpdateSpeedTestRange;;
"-sn" ) RunSpeedtestNow;; "-sn" ) RunSpeedtestNow;;
"-sc" ) ClearSpeedtestData;; "-sc" ) ClearSpeedtestData;;
"-ss" ) SpeedtestServer;; "-ss" ) SpeedtestServer;;
=======
"audit" ) audit;; "audit" ) audit;;
"*" ) helpFunc;; >>>>>>> 5ba413569ea8a4220c7e3bd2fa8c28b33b9e8492
* ) helpFunc;;
esac esac
shift shift