From a436d55f239ab368e612f6a6e14676c7b2ff359d Mon Sep 17 00:00:00 2001
From: Siddhu <arevindh@gmail.com>
Date: Fri, 8 Dec 2017 00:18:19 +0530
Subject: [PATCH 1/3] fix for escape char
---
advanced/Scripts/webpage.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 5dd21e56..517afba0 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -108,7 +108,7 @@ SetWebPassword() {
# 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
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 ""
if [ "${PASSWORD}" == "" ]; then
@@ -609,7 +609,7 @@ main() {
"-sc" ) ClearSpeedtestData;;
"-ss" ) SpeedtestServer;;
"audit" ) audit;;
- * ) helpFunc;;
+ "*" ) helpFunc;;
esac
shift
From 3e246f99ca411026b81dfc67bbea0c04e5b63b5a Mon Sep 17 00:00:00 2001
From: Siddhu <arevindh@gmail.com>
Date: Fri, 8 Dec 2017 00:31:16 +0530
Subject: [PATCH 2/3] Fix on merge conflict
---
advanced/Scripts/webpage.sh | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 517afba0..ef4b10d3 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -37,7 +37,6 @@ Options:
-e, email Set an administrative contact address for the Block Page
-h, --help Show this help dialog
-i, interface Specify dnsmasq's interface listening behavior
-<<<<<<< HEAD
Add '-h' for more info on interface usage
-s, speedtest Set speedtest intevel , user 0 to disable Speedtests
use -sn to prevent logging to results list
@@ -45,9 +44,6 @@ Options:
-sc Clear speedtest data
-ss Set custom server"
-=======
- Add '-h' for more info on interface usage"
->>>>>>> 5ba413569ea8a4220c7e3bd2fa8c28b33b9e8492
exit 0
}
@@ -108,7 +104,7 @@ SetWebPassword() {
# 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
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 ""
if [ "${PASSWORD}" == "" ]; then
@@ -603,13 +599,16 @@ main() {
"-i" | "interface" ) SetListeningMode "$@";;
"-t" | "teleporter" ) Teleporter;;
"adlist" ) CustomizeAdLists;;
+<<<<<<< HEAD
"-s" | "speedtest" ) ChageSpeedTestSchedule;;
"-sd" ) UpdateSpeedTestRange;;
"-sn" ) RunSpeedtestNow;;
"-sc" ) ClearSpeedtestData;;
"-ss" ) SpeedtestServer;;
+=======
"audit" ) audit;;
- "*" ) helpFunc;;
+>>>>>>> 5ba413569ea8a4220c7e3bd2fa8c28b33b9e8492
+ * ) helpFunc;;
esac
shift
From eb2d86bf191f5c91748987d2240e1dd71b90a0b5 Mon Sep 17 00:00:00 2001
From: Siddhu <arevindh@gmail.com>
Date: Fri, 8 Dec 2017 00:32:29 +0530
Subject: [PATCH 3/3] conflict resolve
---
advanced/Scripts/webpage.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index ef4b10d3..c2f93cf7 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -599,15 +599,12 @@ main() {
"-i" | "interface" ) SetListeningMode "$@";;
"-t" | "teleporter" ) Teleporter;;
"adlist" ) CustomizeAdLists;;
-<<<<<<< HEAD
"-s" | "speedtest" ) ChageSpeedTestSchedule;;
"-sd" ) UpdateSpeedTestRange;;
"-sn" ) RunSpeedtestNow;;
"-sc" ) ClearSpeedtestData;;
"-ss" ) SpeedtestServer;;
-=======
"audit" ) audit;;
->>>>>>> 5ba413569ea8a4220c7e3bd2fa8c28b33b9e8492
* ) helpFunc;;
esac