tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,323 Commits 6 Branches 109 Tags 29 MiB
Commit Graph

2323 Commits

Author SHA1 Message Date
Adam Warner 0acf70f836 Merge pull request #1340 from AnthonyGiorgio/development 
Formatting cleanup.
 2017-03-19 18:40:50 +00:00
Anthony Giorgio fd584dd03b Formatting cleanup. 
Convert backticks to quotes to fix error message.
Make Pi-hole capitalization consistent.
 Make Pi-hole capitalization consistent.
 2017-03-18 20:47:13 -04:00
Dan Schaper 2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog 
Debugging tweaks for temporary logfiles
 2017-03-16 23:35:15 -07:00
Mcat12 62a242a894 Merge pull request #1334 from pi-hole/tweak/interface_detect 
Let `ip` determine which links are candidates.
 2017-03-16 21:36:13 -04:00
DL6ER 8b060e9699 Merge pull request #1333 from Wandmalfarbe/development 
Fixed minor spelling mistakes in README.md
 2017-03-16 18:02:40 +01:00
Dan Schaper b1f769b671
Output cleaning, IP stack check headers. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:50:29 -07:00
Dan Schaper 77378da70a
Cat out temp files to final log. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:43:41 -07:00
Dan Schaper 160030b75f
Quiet systemctl output to just the current daemon status. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:27:18 -07:00
Dan Schaper 0a0c3a2fb7
Copy working temp to final location. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:20:12 -07:00
Dan Schaper e9f1ca338f
Create temp files for working storage, log to working storage temps. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 22:49:47 -07:00
Dan Schaper 073c7e54df Merge pull request #1331 from pi-hole/RemovePasswordFromDebugLogBecauseSomePeopleFeelItUnderminesSecurity-TheyProbablyHaveAPoint 
add check on file_parse to not include WEBPASSWORD= in the debug log
 2017-03-15 22:08:48 -07:00
Dan Schaper 2834f2ccc2
Let `ip` determine which links are candidates. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 22:05:48 -07:00
Wandmalfarbe ab2af11775 Fixed minor spelling mistakes in README.md 2017-03-15 20:58:41 +01:00
Adam Warner cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log 2017-03-15 18:59:41 +00:00
Mcat12 a6caa0e680 Merge pull request #1327 from pi-hole/fix/pihole-help-text 
Fix help text bug
 2017-03-14 15:00:25 -04:00
Mcat12 c4b43f92ce Fix help text bug 
Fixes #1325
 2017-03-14 13:19:43 -04:00
Mcat12 88835512dd Merge pull request #1322 from pi-hole/FixWildCardBlacklisting 
Only remove from wildcard list if domain is being added to whitelist …
 2017-03-13 17:50:18 -04:00
Adam Warner 6b862dd9e9 Only remove from wildcard list if domain is being added to whitelist or blacklist 2017-03-13 20:38:34 +00:00
DL6ER be0b76c954 Merge pull request #1319 from pi-hole/fix/gravitypath 
Use absolute path for pihole command in gravity.sh
 2017-03-13 21:16:31 +01:00
DL6ER d7b5870ba6
Use absolute path for pihole command in gravity.sh. Fixes #1318 2017-03-12 23:15:23 +01:00
Dan Schaper 2e74219ff9 Merge pull request #1313 from pi-hole/new/piholecheckout 
Checkout adjustments
 2017-03-11 13:01:11 -08:00
Dan Schaper b0ae954f1e
Only update when `update` flag is set to "true" 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-11 12:37:36 -08:00
Dan Schaper a2404f104a
Just some style and linting. And a `cd` in `fetch_checkout_pull_branch` 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-11 12:21:15 -08:00
DL6ER 38547ced7a
Can only diff once upstream branch is tracked 2017-03-11 16:55:37 +01:00
DL6ER 9a9d9007cd
Add missing "== true" 2017-03-11 16:49:47 +01:00
DL6ER bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not 2017-03-11 16:46:52 +01:00
DL6ER 1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities 2017-03-11 16:40:10 +01:00
DL6ER d4a49d192f
Correct variable name 2017-03-11 16:38:28 +01:00
DL6ER 8cb66544d2
Remove "\ " 2017-03-11 16:36:54 +01:00
DL6ER 140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it) 2017-03-11 16:30:58 +01:00
DL6ER b961b13d60
Small bugfix 2017-03-11 16:27:00 +01:00
DL6ER febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all) 2017-03-11 16:24:13 +01:00
DL6ER 1d60b62e7a
Testing alternative way of fetching/checking out of a single branch 2017-03-11 16:11:23 +01:00
Dan Schaper 41e1e4cb68
Rearrange pull logic, some optimization. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:25:35 -08:00
Dan Schaper d5b88e0df8
Get the right name for the options. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:07:58 -08:00
Dan Schaper 20fd61468d
Require branch to check out 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:04:37 -08:00
Dan Schaper 0a0d25dff4
Script runs in subshell, no need to cd back to pwd. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 10:57:46 -08:00
Mcat12 9df6a8dd06 Merge pull request #1311 from pi-hole/tweak/ascii-berry 
add ascii berry to beginning of installer
 2017-03-09 13:40:57 -05:00
Jacob Salmela 5e16487ef6
add ascii berry to beginning of installer 2017-03-08 21:14:21 -06:00
DL6ER 2b3afbfef8 Merge pull request #1310 from pi-hole/new/piholecheckout 
Pi-hole checkout feature
 2017-03-09 00:43:35 +01:00
Dan Schaper c3c7dcc9f5
Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout 2017-03-08 15:32:14 -08:00
Dan Schaper 273728b481
One more argument to shift. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 15:32:06 -08:00
DL6ER 81a1057cac
Fix something Dan has overlooked 2017-03-09 00:30:36 +01:00
DL6ER fd310c6445
Back to how we had it before, because --unshallow does not work at all 2017-03-09 00:28:02 +01:00
Dan Schaper a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift` 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:29:51 -08:00
Dan Schaper 87da40068c
Always `exit`ed with value 1, now exits with proper value. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:18:08 -08:00
Dan Schaper b8f1eadb7f
Shift off `checkout` from being passed to script from `pihole` 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:17:56 -08:00
Dan Schaper b522d8eaf6
Source and reuse existing variables, centralize code. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:41:11 -08:00
Dan Schaper 89ff99322d
Don't need to remember `pwd` inside a function, calling function doesn't change directories. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:30:08 -08:00
Dan Schaper 56e17d1010
Source functions and variables from basic-install.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:28:24 -08:00