Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							d9a16b0ff4 
							
						 
					 
					
						
						
							
							Clear up bottom half of script with fewer redundenicies.  
						
						
						
						
					 
					
						2016-10-28 15:25:06 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							cb5c94ef5e 
							
						 
					 
					
						
						
							
							Sorry, left that gravity.list parser in. Big debug files. Cleared that up.  
						
						
						
						
					 
					
						2016-10-28 15:13:04 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							85fbd66871 
							
						 
					 
					
						
						
							
							Good commit point, number of changes  
						
						
						
						
					 
					
						2016-10-28 14:52:08 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							d4a3a5c180 
							
						 
					 
					
						
						
							
							Trying to implement The Brontide Idiom for design.  
						
						
						
						
					 
					
						2016-10-28 10:42:30 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							71e3a473d6 
							
						 
					 
					
						
						
							
							Fix = underbar  
						
						
						
						
					 
					
						2016-10-28 07:16:16 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							c2cfc09f63 
							
						 
					 
					
						
						
							
							Clean up more of the UX and log. Lots to go.  
						
						
						
						
					 
					
						2016-10-28 07:06:05 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							01f10b56e8 
							
						 
					 
					
						
						
							
							Refactor out some more reudndant code.  
						
						
						
						
					 
					
						2016-10-28 06:51:30 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							90ec0a610e 
							
						 
					 
					
						
						
							
							Tricorder is introduced.  
						
						
						
						
					 
					
						2016-10-28 04:42:45 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							42bff1ce1b 
							
						 
					 
					
						
						
							
							Move parse utility to be near other parsing functions.  
						
						
						
						
					 
					
						2016-10-28 03:53:53 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							e3c7a1f31f 
							
						 
					 
					
						
						
							
							Top half user output updated.  
						
						
						
						
					 
					
						2016-10-28 03:49:03 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							0debbffa70 
							
						 
					 
					
						
						
							
							Add a couple of parsing utility functions.  
						
						
						
						
					 
					
						2016-10-28 03:45:07 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							f9570a82cc 
							
						 
					 
					
						
						
							
							Remove glitchy daemon detection.  
						
						
						
						
					 
					
						2016-10-27 00:58:24 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							36285ead57 
							
						 
					 
					
						
						
							
							Just becuase this is bugging me, but I'll fix it later.  
						
						
						
						
					 
					
						2016-10-27 00:32:18 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							13e488dace 
							
						 
					 
					
						
						
							
							Daemon check for lighttpd and dnsmasq.  
						
						
						
						
					 
					
						2016-10-27 00:30:51 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							f169da8fd0 
							
						 
					 
					
						
						
							
							Set for quiet temporarily.  
						
						
						
						
					 
					
						2016-10-26 14:48:11 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							60741298b7 
							
						 
					 
					
						
						
							
							Cut more verbosity. Prep for lsof parsing and daemon tests.  
						
						
						
						
					 
					
						2016-10-26 14:33:47 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							f73734acb0 
							
						 
					 
					
						
						
							
							Only check IPv6 Gateway if it exists.  
						
						
						
						
					 
					
						2016-10-26 13:57:57 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							fc360abe43 
							
						 
					 
					
						
						
							
							Only check IPv6 if system is enabled.  
						
						
						
						
					 
					
						2016-10-26 12:22:20 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							98db002770 
							
						 
					 
					
						
						
							
							Tighten IP test reponse to user.  
						
						
						
						
					 
					
						2016-10-26 11:38:19 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							4269626f5d 
							
						 
					 
					
						
						
							
							Attribute source for bashism.  
						
						
						
						
					 
					
						2016-10-25 21:53:41 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							8fa897aadb 
							
						 
					 
					
						
						
							
							Add back in sourcing files (setupVars.conf) and tweak ip_check  
						
						
						
						
					 
					
						2016-10-25 21:39:28 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							f549618d12 
							
						 
					 
					
						
						
							
							Move environment IPv6 interface check to ip_check and fix IPv6 source routing issue.  
						
						
						
						
					 
					
						2016-10-25 21:25:57 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							2fa47aaf31 
							
						 
					 
					
						
						
							
							Source routing is deprecated by RFC5095  
						
						
						
						
					 
					
						2016-10-25 20:53:18 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							b0874fb23a 
							
						 
					 
					
						
						
							
							Temporarily get rid of gateway sourcing from setupVars, temporarily.  
						
						
						
						
					 
					
						2016-10-25 19:53:00 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							fb70fd77e8 
							
						 
					 
					
						
						
							
							Prototype version_check, add helper functions for logging and echo.  
						
						
						
						
					 
					
						2016-10-25 17:50:14 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Schaper 
							
						 
					 
					
						
						
						
						
							
						
						
							01f17f9cbb 
							
						 
					 
					
						
						
							
							Reduce header verbosity. New header writer.  
						
						
						
						
					 
					
						2016-10-25 17:19:33 -07:00 
						 
				 
			
				
					
						
							
							
								Adam Warner 
							
						 
					 
					
						
						
						
						
							
						
						
							aba0d93fda 
							
						 
					 
					
						
						
							
							Merge pull request  #814  from pi-hole/promoTweaksTheSecond  
						
						... 
						
						
						
						Various tweaks and fixes: Part 2 (Plus Pause/Resume button functionality!) 
						
						
					 
					
						2016-10-25 17:43:40 +06:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							b49384ffe4 
							
						 
					 
					
						
						
							
							intent  
						
						
						
						
					 
					
						2016-10-23 22:44:21 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							7fb622638b 
							
						 
					 
					
						
						
							
							flip reload logic. Do not reload if there are not changes made to blacklist.txt  
						
						
						
						
					 
					
						2016-10-23 22:44:06 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							bd0cc134bf 
							
						 
					 
					
						
						
							
							MERGE FAIL :ashamed_face:  
						
						
						
						
					 
					
						2016-10-23 22:43:11 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							476fd1f695 
							
						 
					 
					
						
						
							
							indentation  
						
						
						
						
					 
					
						2016-10-23 22:38:18 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							96053d13be 
							
						 
					 
					
						
						
							
							Flip reload logic. Do not reload lists if no changes made to whitelist.txt  
						
						
						
						
					 
					
						2016-10-23 22:38:06 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							c958bed418 
							
						 
					 
					
						
						
							
							Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function  
						
						
						
						
					 
					
						2016-10-23 22:31:20 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							2b2c240d39 
							
						 
					 
					
						
						
							
							Fix shebang line broken in  #831  
						
						... 
						
						
						
						Remove root check and references to ${SUDO}
Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854  
						
						
					 
					
						2016-10-23 22:15:10 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							b79392ba2c 
							
						 
					 
					
						
						
							
							exit after displaying white/blacklist  
						
						
						
						
					 
					
						2016-10-23 19:49:51 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							d0826b2c33 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/airencracken/pi-hole  into airencracken-dev  
						
						
						
						
					 
					
						2016-10-23 19:33:28 +01:00 
						 
				 
			
				
					
						
							
							
								Marcus Hildum 
							
						 
					 
					
						
						
						
						
							
						
						
							07a66a70fc 
							
						 
					 
					
						
						
							
							Consistency  
						
						... 
						
						
						
						More of the same 
						
						
					 
					
						2016-10-22 10:12:05 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Hildum 
							
						 
					 
					
						
						
						
						
							
						
						
							69ba8a3c2f 
							
						 
					 
					
						
						
							
							Consistency  
						
						... 
						
						
						
						Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner. 
						
						
					 
					
						2016-10-22 10:01:15 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Hildum 
							
						 
					 
					
						
						
						
						
							
						
						
							a30c75ef71 
							
						 
					 
					
						
						
							
							Consistency  
						
						... 
						
						
						
						Cleanup! 
						
						
					 
					
						2016-10-22 00:35:44 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Hildum 
							
						 
					 
					
						
						
						
						
							
						
						
							d0b3727c5d 
							
						 
					 
					
						
						
							
							Consistency  
						
						... 
						
						
						
						Yet more cleanup 
						
						
					 
					
						2016-10-22 00:32:36 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Hildum 
							
						 
					 
					
						
						
						
						
							
						
						
							6e94bf5b6d 
							
						 
					 
					
						
						
							
							Consistency  
						
						... 
						
						
						
						You know the drill 
						
						
					 
					
						2016-10-22 00:14:38 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Hildum 
							
						 
					 
					
						
						
						
						
							
						
						
							0f04e270a7 
							
						 
					 
					
						
						
							
							consistency  
						
						... 
						
						
						
						Just more cleanup 
						
						
					 
					
						2016-10-22 00:10:25 -07:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							c0012540ed 
							
						 
					 
					
						
						
							
							Re-add shebang  
						
						
						
						
					 
					
						2016-10-20 21:08:07 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							9ab6df0e54 
							
						 
					 
					
						
						
							
							Merge branch 'development' into promoTweaksTheSecond  
						
						... 
						
						
						
						# Conflicts:
#	advanced/Scripts/blacklist.sh
#	advanced/Scripts/whitelist.sh 
						
						
					 
					
						2016-10-20 21:06:28 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							a64f4cd871 
							
						 
					 
					
						
						
							
							whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument  
						
						
						
						
					 
					
						2016-10-19 23:17:20 +01:00 
						 
				 
			
				
					
						
							
							
								Promofaux 
							
						 
					 
					
						
						
						
						
							
						
						
							a41eff1276 
							
						 
					 
					
						
						
							
							Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument  
						
						
						
						
					 
					
						2016-10-19 23:16:52 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Warner 
							
						 
					 
					
						
						
						
						
							
						
						
							b66f23cfd0 
							
						 
					 
					
						
						
							
							account for new update script  
						
						
						
						
					 
					
						2016-10-18 14:19:44 +01:00 
						 
				 
			
				
					
						
							
							
								Adam Warner 
							
						 
					 
					
						
						
						
						
							
						
						
							27d6e5d8cf 
							
						 
					 
					
						
						
							
							Complete overhaul of update logic. Moved to seperate script  
						
						
						
						
					 
					
						2016-10-18 14:19:25 +01:00