33 commits

Author	SHA1	Message	Date
Tommy Huff	40fdaea099	back to python works with 2 and 3	2016-10-24 20:52:08 -04:00
Tommy Huff	33285d8d8c	try with jq	2016-10-24 19:49:55 -04:00
Tommy Huff	e9f14da1b4	Merge branch 'development' of https://github.com/pi-hole/pi-hole into development / update chro	2016-10-24 17:46:38 -04:00
Tommy Huff	99c3c57968	update chronometer	2016-10-24 17:41:14 -04:00
Marcus Hildum	6e94bf5b6d	Consistency ... You know the drill	2016-10-22 00:14:38 -07:00
Marcus Hildum	0efda04920	Use heredocs instead of multiple calls to echo ... There were a lot of places (like in help functions) that used multiple echo calls instead of heredocs. Personal opinion but this seems cleaner.	2016-10-19 20:46:37 -07:00
Marcus Hildum	28eeaf201b	Standardize function declaration ... There were no fewer than three styles of function declaration going on in these files, so I attempted to standardize them to the typical myfucn() { } style.	2016-10-19 19:47:45 -07:00
Promofaux	090fbd04af	Remove ${SUDO} usages and root checks from scripts called by pihole command as they should not be called directly.	2016-10-15 17:54:04 +01:00
Promofaux	b3e7619048	curly brackets all the variables!	2016-08-21 02:12:02 +01:00
Carter Maxwell	c0e1772e21	Replace toilet with echo	2016-05-07 11:44:18 -07:00
Promofaux	05e0003555	Fixes issue #453	2016-04-10 21:17:58 +01:00
nate	1a2046a7eb	Added uninstall option to pihole command. Minor fixes	2016-04-02 19:20:54 -05:00
nate	fee55fa642	Added gravity.sh to the list of options	2016-03-28 18:37:49 -05:00
nate	76ea1962be	Controller script, pihole.sh added ... Syntax changes for user output to be consistent	2016-03-28 18:31:21 -05:00
nate	8ef4c12f97	Merge branch 'ScriptCleanup' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	2016-03-28 12:21:18 -05:00
nate	0b9e78df2c	Cleaned code and added prompt for purge on uninstall	2016-03-26 16:57:01 -05:00
Morlok8k	d13ae0610e	fix for older versions of uptime, on development branch.	2016-03-08 10:19:01 -08:00
Carter Maxwell	a6877e7c13	remove trailing whitespace chronometer.sh	2016-03-05 21:15:11 -08:00
Hippyjake	21c688a8a8	add uptime -p to chrono script	2016-02-16 18:06:49 -07:00
Promofaux	4c24186911	Fixes divide by zero error.	2016-02-14 02:58:09 +00:00
Mcat12	48f9a61ff0	Updated License	2016-01-30 15:12:40 -05:00
Promofaux	af982a02af	Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.	2016-01-19 21:14:01 +00:00
Adam Warner	f665899116	Update chronometer.sh ... weirdness	2016-01-18 23:35:21 +00:00
Adam Warner	de464e17cc	Update chronometer.sh ... Note to self, Find&Replace>Replace All is a bad idea.	2016-01-18 22:24:02 +00:00
Adam Warner	0eed56380d	Update chronometer.sh ... What, me? Reference the wrong file?	2016-01-18 22:15:39 +00:00
Promofaux	487c26db44	Major overhaul. Added -j option to output stats as JSON formatted string. If run with no option, then chronometer runs as normal. Fixed calculations to match those on the web dashboard.	2016-01-18 22:03:53 +00:00
Dan Schaper	cb91b8f5fa	Add copyright headers	2015-12-06 05:55:50 -08:00
Fourdee	52ef76d717	missed a few more /etc/host changes	2015-07-30 18:10:26 +01:00
Dan	024395b73b	Update chronometer.sh ... Missed a change todaysAdsEliminated to /\/etc\/pihole\/gravity.list/	2015-07-30 18:01:10 +01:00
Fourdee	9d99a4ef36	Patch 3 - Dont use /etc/hosts ... /etc/pihole/gravity.list now stores the block list. Ensures the /etc/hosts file is left untouched.	2015-07-30 17:24:24 +01:00
Dan	9627b27f15	pihole logfile changes ... https://github.com/jacobsalmela/pi-hole/pull/27	2015-07-29 12:22:28 +01:00
jacobsalmela	11614263b8	better version of LCD display stats	2015-07-25 13:05:13 -05:00
jacobsalmela	fd2b24f2a0	preparing files for merge and for testing automated install ... I haven't merged anything before, so hopefully, I won't mess it up too bad!	2015-06-16 11:15:15 -05:00

Renamed from advanced/chronometer.sh (Browse further)