Commit Graph

333 Commits

Author SHA1 Message Date
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
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 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 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
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
Eric Warnke 3da75d6125 Grep was leaking a file not found if blacklist didn't exist 2016-10-28 17:28:04 -04: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
Jacob Salmela 473b58d26d Merge pull request #704 from stonedbovines/development
lighttpd.conf templates change
2016-10-27 20:22:46 -05:00
Dan Schaper 300001e766 Remove `listen-address` directive
Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.
2016-10-27 11:56:16 -07:00
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00