Commit graph

6025 commits

Author SHA1 Message Date
Dan Schaper
d9528dfd09 Bash is funny with returns. 2016-11-02 00:51:38 -07:00
Dan Schaper
12f5f8ba00 Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code. 2016-11-02 00:14:25 -07:00
Dan Schaper
db0f3307e0 Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs. 2016-11-01 22:48:30 -07:00
Dan Schaper
9c83825cb8 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 2016-11-01 22:20:32 -07:00
Dan Schaper
7a22471787 New naming convention, and reorder functions as bash would prefer them to be. 2016-11-01 22:19:40 -07:00
diginc
7548d9a8fe point shellcheck at update.sh instead 2016-11-01 23:56:46 -05:00
diginc
26789f9b36 add travis and python requirements 2016-11-01 23:53:11 -05:00
diginc
b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests 2016-11-01 23:52:20 -05:00
Dan Schaper
6605c269cf Merge pull request #893 from diginc/feature/defensiveTweaks
Feature/defensive tweaks tweaks
2016-11-01 21:35:20 -07:00
diginc
c30478bf4a cleanup and use sentintel in is_repo 2016-11-01 23:21:50 -05:00
diginc
d986746ef9 missing quote added 2016-11-01 23:07:20 -05:00
diginc
a8fa061f2e quote all the assignments prevent accidental glob splitting 2016-11-01 23:02:06 -05:00
diginc
72015b0226 reduce complexity and un needed cat 2016-11-01 23:00:14 -05:00
Jacob Salmela
f8e9726922 source setupVars and check for the correct variable 2016-11-01 19:01:48 -05:00
Jacob Salmela
884363bd05 remove ipv6 check since it's already in setupVars 2016-11-01 19:01:28 -05:00
Dan Schaper
bdd240ecb6 Shellcheck catch for always true expansion. 2016-11-01 15:36:27 -07:00
Dan Schaper
04da292df9 Missed one spinner, updated and exit script if github is unreachable. 2016-11-01 12:17:38 -07:00
Dan Schaper
85b8676b8e Remove spinner, no functions here should last that long, and it masks a few potential exit avenues. 2016-11-01 12:16:46 -07:00
Dan Schaper
114bc13c23 Specify path, cron may not know where the files are located. 2016-11-01 12:03:26 -07:00
Dan Schaper
5fef5f1ed4 Break down is_repo to make sure it does what is expected. 2016-11-01 11:54:14 -07:00
Dan Schaper
807b60b0e6 Missed the second reinstaller.... 2016-11-01 11:44:16 -07:00
Dan Schaper
fbc800e556 If unattened reinstall fails, notify user and exit script immediately. 2016-11-01 11:42:18 -07:00
Dan Schaper
1991ee7a7d Google Style Guide. readonly and cap constants. 2016-11-01 11:36:44 -07:00
Dan Schaper
ffbfadbccf Detail what the script does. 2016-11-01 11:33:04 -07:00
Dan Schaper
c3e2bce956 Variables declared as strings, make sure they are strings when we use them in functions. 2016-11-01 11:26:57 -07:00
Dan Schaper
0c9520d7e3 Protect against unexepcted return values (GitHub not responding as we'd expect.) And make sure bash doesn't maul the variables and cause firing of unattended reinstall of application when values returned aren't as expected. 2016-11-01 11:18:41 -07:00
Dan Schaper
1e7e5230cc Clarify what exactly is being called and the expected returned value format 2016-11-01 11:15:21 -07:00
Dan Schaper
f1efc97357 Clairfy condition to make sure they operate as per the specs of the logic flow layout. 2016-11-01 11:04:33 -07:00
Eric Warnke
fb5ac6d6d7 We should prefer the php metapackage if it's there, falling back on php5 if it's not 2016-10-31 21:31:13 -04:00
Eric Warnke
4e7ca51beb Added dependancy for ping and lsof used in debug scripts 2016-10-31 21:24:57 -04:00
Adam Warner
d561600a31 Merge pull request #863 from brontide/wheezy_fix2
[Test] Wheezy install fix by selecting appropriate deps, made the php check …
2016-10-31 22:35:46 +00:00
Adam Warner
024e843998 Merge pull request #884 from pi-hole/PromoFaux-patch-2
Update pullapprove into master
2016-10-30 17:17:53 +00:00
Adam Warner
126f275e18 Update pullapprove into master
Requires approval of ALL members of the `admin` team.
2016-10-30 17:15:35 +00:00
Dan Schaper
c65e5ff8e0 Merge pull request #882 from pi-hole/feature/DiscourseREADME
Feature/discourse readme
2016-10-30 08:05:48 -07:00
Dan Schaper
ef13e67572 Update README.md 2016-10-30 07:11:34 -07:00
Dan Schaper
7920fcbb5e Add linux.die.net links
Add links for online manpages.
2016-10-30 07:09:03 -07:00
Dan Schaper
fa36fdeb03 Update README
Add discourse links, remove last of Optimal, bring Other Devices up to the top, update alternate install instructions.
2016-10-30 07:06:27 -07:00
Adam Warner
c143b5ccb4 Merge pull request #881 from pi-hole/feature/doc-update
Update last modified date for adlist
2016-10-30 14:04:30 +00:00
Dan Schaper
05c8406fca Update last modified date for adlist 2016-10-30 06:37:36 -07:00
Dan Schaper
69e3a45083 Merge pull request #874 from pi-hole/development
Next release 2.9.5
2016-10-29 17:01:51 -07:00
Dan Schaper
45259b6ec6 Merge branch 'master' into development 2016-10-29 16:59:02 -07:00
Adam Warner
d6fe48112c Merge pull request #857 from pi-hole/feature/debugUpdate
Debug Updates
2016-10-29 23:15:07 +01:00
Dan Schaper
dcf6e6b14d Clarify user action required to end the scripts. 2016-10-29 12:24:22 -07:00
Dan Schaper
908697a963 User token instructions, and small bugfix for missing separator. 2016-10-29 12:04:18 -07:00
Dan Schaper
bdaf961196 Merge pull request #876 from brontide/list_fix
[bug] Grep was leaking a file not found if blacklist didn't exist
2016-10-29 07:15:22 -07:00
Dan Schaper
6bd5d9b1a4 Merge pull request #879 from pi-hole/PromoFaux-patch-2
Update README.md
2016-10-29 07:13:26 -07:00
Adam Warner
beb0dae5a7 Update README.md
Add code climate badge
2016-10-29 14:46:09 +01:00
Dan Schaper
fad2d6b1d1 Return values start showin up now. Logic operators too... 2016-10-28 15:53:18 -07:00
Dan Schaper
9cd830b6aa Start to refine tests and clean up code. 2016-10-28 15:37:45 -07:00
Dan Schaper
d9a16b0ff4 Clear up bottom half of script with fewer redundenicies. 2016-10-28 15:25:06 -07:00