Commit Graph

355 Commits

Author SHA1 Message Date
Adam Warner b191cd73a7 Update piholeDebug.sh
wording
2016-11-15 13:28:18 +00:00
Jacob Salmela ca56ca5bd8 promo-tweak
Better logic introduced by @PromoFaux
2016-11-06 11:16:48 -06:00
Jacob Salmela a0f0dff88e replace hardcoded interface with var
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
2016-11-06 08:18:57 -06:00
Dan Schaper 8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
Bugfix/chronometer domain count
2016-11-03 13:55:29 -07:00
Adam Warner 4300759287 Fix logic. If both v6 and v4 divide by two, else dont. 2016-11-03 08:01:25 +00:00
Promofaux d7d6d6f991 Update to use new Var name 2016-11-02 21:46:30 +00:00
Promofaux 2f976504e8 switch out -eq for == 2016-11-02 20:06:21 +00:00
Dan Schaper 4b7b859db9 Gotta catch 'em all...' 2016-11-02 12:29:55 -07:00
Dan Schaper f7d0de53bb Compare string to string. 2016-11-02 12:11:34 -07:00
Dan Schaper 603ec997ba Remove testing block. 2016-11-02 12:09:33 -07:00
Dan Schaper f7266ef4c8 Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user. 2016-11-02 12:07:59 -07:00
Dan Schaper 3d43e1568c Use explicit calls for function to self-document 2016-11-02 11:39:22 -07:00
Dan Schaper c1a3f003e8 Rename the only utilty function left that didn't say `repo` 2016-11-02 11:18:13 -07:00
Dan Schaper 3f61aea7fc Utility functions fully quiet now. Calling functions have the echos. 2016-11-02 11:09:53 -07:00
Dan Schaper bd68db51e0 ShellCheck split local declaration and assignment. 2016-11-02 11:01:50 -07:00
Dan Schaper b8a5ed710e Take echos out of utility functions and move up a level. 2016-11-02 10:51:09 -07:00
Dan Schaper 34be601dd7 Test for lexicographically less than tag version. 2016-11-02 10:42:05 -07:00
Dan Schaper 1d64ad1ccd Stash all changed files, clean directory and pull updates. 2016-11-02 10:39:27 -07:00
Dan Schaper f2d7a3d26d Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 2016-11-02 09:48:00 -07:00
Adam Warner ee37c37cab fix update output logic. version number variables should not be read only! 2016-11-02 14:29:20 +00:00
Dan Schaper b636c1e1f8 Whitespace. 2016-11-02 07:00:43 -07:00
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
# Conflicts:
#	advanced/Scripts/update.sh
#	automated install/basic-install.sh
2016-11-02 06:57:33 -07:00
Dan Schaper ece1667fb0 Refactor and move some bits. 2016-11-02 06:41:51 -07:00
Adam Warner 50bd8b4a09 Further tweaks to local repo handling 2016-11-02 13:34:57 +00:00
Dan Schaper 93d91353a1 All tabs now spaced 2016-11-02 05:49:33 -07:00
Dan Schaper 8dc9143b34 Just delete, no need to cd there first. 2016-11-02 05:45:29 -07:00
Dan Schaper a0d9a1133c Factoring and combining functions 2016-11-02 05:34:39 -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 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 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
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