From 3ade7a8b0eccc7b63766c85d626777db5d0c5f26 Mon Sep 17 00:00:00 2001 From: Patrick Geneva Date: Fri, 5 Aug 2016 21:27:55 -0400 Subject: [PATCH 1/4] Added - Readme Windows Tray App --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index acfce86c..09de0d03 100644 --- a/README.md +++ b/README.md @@ -102,6 +102,7 @@ You can view [real-time stats](http://pi-hole.net/faq/install-the-real-time-lcd- - [unRaid-hole](https://github.com/spants/unraidtemplates/blob/master/Spants/unRaid-hole.xml#L13)--[Repo and more info](http://lime-technology.com/forum/index.php?PHPSESSID=c0eae3e5ef7e521f7866034a3336489d&topic=38486.0) - [Pi-hole on/off button](http://thetimmy.silvernight.org/pages/endisbutton/) - [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole) +- [Windows Tray Stat Application](https://github.com/goldbattle/copernicus) ## Coverage From ae47be0ce92376c64f37deb9fd96217d3fe87782 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Wed, 17 Aug 2016 18:59:00 +0100 Subject: [PATCH 2/4] Add HelpFunc --- gravity.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gravity.sh b/gravity.sh index 6278d80a..b5b119f3 100755 --- a/gravity.sh +++ b/gravity.sh @@ -27,6 +27,18 @@ else fi fi +function helpFunc() +{ + echo "::: Pull in domains from adlists" + echo ":::" + echo "::: Usage: pihole -g" + echo ":::" + echo "::: Options:" + echo "::: -f, --force Force lists to be downloaded, even if they don't need updating." + echo "::: -h, --help Show this help dialog" + exit 1 +} + piholeIPfile=/etc/pihole/piholeIP piholeIPv6file=/etc/pihole/.useIPv6 From f6ac0d73b4fd017096fda97d7cf3e991db1b6997 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Wed, 17 Aug 2016 19:08:55 +0100 Subject: [PATCH 3/4] Add force delete option --- gravity.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gravity.sh b/gravity.sh index b5b119f3..52d4ee5b 100755 --- a/gravity.sh +++ b/gravity.sh @@ -340,6 +340,23 @@ function gravity_reload() { echo " done!" } + +for var in "$@" +do + case "$var" in + "-f" | "--force" ) force=true;; + "-h" | "--help" ) helpFunc;; + esac +done + +#Overwrite adlists.default from /etc/.pihole in case any changes have been made. Changes should be saved in /etc/adlists.list + +if $force; then + echo -n "::: Deleting exising list cache..." + $SUDO rm /etc/pihole/list.* + echo " done!" +fi + $SUDO cp /etc/.pihole/adlists.default /etc/pihole/adlists.default gravity_collapse gravity_spinup From 01211364986a842ace33bab93607eb4455476af8 Mon Sep 17 00:00:00 2001 From: Victor Marquez Date: Fri, 19 Aug 2016 20:45:17 -0400 Subject: [PATCH 4/4] Added window.close() to index.html Adding window.close() will automatically close any pop-ups that might get loaded with a blocked ad. --- advanced/index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/advanced/index.html b/advanced/index.html index 6bfc7988..3a4abe1f 100644 --- a/advanced/index.html +++ b/advanced/index.html @@ -1,4 +1,7 @@ + + + - \ No newline at end of file +