Adam Warner
|
f36e4ba336
|
Cherry picking 3f049fa79 , conflict fix
|
2016-11-02 04:34:02 -07:00 |
|
Adam Warner
|
3df2ef8587
|
Cherry picking f6f6f6d , conflict fix
|
2016-11-02 04:31:28 -07:00 |
|
Adam Warner
|
354309fcad
|
set QUERY_LOGGING default to true
|
2016-11-02 04:28:58 -07:00 |
|
Dan Schaper
|
e832bfc61e
|
Merge branch 'feature/defensiveTweaks' of github.com:pi-hole/pi-hole into feature/defensiveTweaks
|
2016-11-02 04:22:29 -07:00 |
|
Adam Warner
|
99057ed859
|
Update var names from setupVars.conf in gravity.sh
|
2016-11-02 04:21:54 -07:00 |
|
Adam Warner
|
c47c5e466f
|
consistency
|
2016-11-02 04:18:52 -07:00 |
|
Adam Warner
|
edd00e8e70
|
consistency
|
2016-11-02 04:12:37 -07:00 |
|
Adam Warner
|
82e7de2aaa
|
Account for variable name changes
|
2016-11-02 04:12:21 -07:00 |
|
Adam Warner
|
b723714c0c
|
Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names
|
2016-11-02 04:12:06 -07:00 |
|
Adam Warner
|
a2903b6e63
|
Consistency
|
2016-11-02 04:11:54 -07:00 |
|
Dan Schaper
|
9a1876571b
|
Prototype whiptails so they don't fall to shell. Need to do this to all functions.
|
2016-11-02 04:11:41 -07:00 |
|
Dan Schaper
|
c07d7165ab
|
Global variables CAP'ed
|
2016-11-02 04:11:27 -07:00 |
|
Dan Schaper
|
d695c5972f
|
local variables just to be safe and make sure they stay in this function.
|
2016-11-02 04:11:09 -07:00 |
|
Dan Schaper
|
bbc09ed313
|
Swap variable names.
|
2016-11-02 04:10:57 -07:00 |
|
Promofaux
|
1d21b0da9a
|
enable or disable logging from pihole command
|
2016-11-02 04:10:43 -07:00 |
|
Promofaux
|
617a147706
|
Wording adjustment
|
2016-11-02 04:10:29 -07:00 |
|
Promofaux
|
d4dccfdb2d
|
Cherry pick 229439c
|
2016-11-02 04:08:53 -07:00 |
|
Dan Schaper
|
035e4bf727
|
Move value checks to if calls.
|
2016-11-02 03:55:04 -07:00 |
|
Dan Schaper
|
9ec5bbd560
|
Actually get is_repo to return a value and have it expected.
|
2016-11-02 03:38:35 -07:00 |
|
Dan Schaper
|
34482c5ed6
|
Modified is_repo
|
2016-11-02 03:09:59 -07:00 |
|
Dan Schaper
|
7d414b5628
|
Move version messages to main function, check for repos.
|
2016-11-02 01:12:02 -07:00 |
|
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 |
|
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 |
|