Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development

2016-08-25 12:09:54 +01:00 · 2016-08-25 12:09:54 +01:00 · e9a0ddf798
parent 037318e2ff 4f5fcc2a37
commit e9a0ddf798
3 changed files with 34 additions and 1 deletions
--- 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

--- a/advanced/index.html
+++ b/advanced/index.html
@ -1,4 +1,7 @@
 <html>
+<head>
+<script>window.close();</script>
+</head>
 <body>
 </body>
 </html>
--- 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

@ -328,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