Commit Graph

  • b9a263ecb2 Merge pull request #907 from pi-hole/bugfix/chronometer-interface Mcat12 2016-11-07 21:35:09 -05:00
  • 4929d415a6 Merge pull request #906 from pi-hole/Fix/send-frs-into-orbit Dan Schaper 2016-11-07 17:32:28 -08:00
  • b9e1f518aa Merge pull request #909 from bcambl/fix_ifcfg_append Dan Schaper 2016-11-07 17:23:50 -08:00
  • 0caa44e979 write ifcfg instead of appending bcambl 2016-11-07 12:54:31 -06:00
  • ca56ca5bd8 promo-tweak Jacob Salmela 2016-11-06 11:16:48 -06:00
  • a0f0dff88e replace hardcoded interface with var Jacob Salmela 2016-11-06 08:18:57 -06:00
  • e5cc38a210 Direct users to Discourse for FRs Jacob Salmela 2016-11-06 08:08:58 -06:00
  • 6cb5bb7200 Merge pull request #903 from pi-hole/feature/PRGuide Adam Warner 2016-11-04 21:17:20 +00:00
  • 563696e291 PR against Development guide Dan Schaper 2016-11-04 14:01:01 -07:00
  • c755b3c49e Added Link to blink1_pi-hole.py Markus Busche 2016-11-04 21:56:14 +01:00
  • b9f3493dbc move PH_TRUE to Dockerfiles to DRY diginc 2016-11-03 22:34:04 -05:00
  • 8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count Dan Schaper 2016-11-03 13:55:29 -07:00
  • c2930b0ca5 remove the debug print in mock_command Adam Hill 2016-11-03 08:34:44 -05:00
  • 4300759287 Fix logic. If both v6 and v4 divide by two, else dont. Adam Warner 2016-11-03 08:01:25 +00:00
  • fc1854cadd Merge pull request #897 from pi-hole/feature/travisDevBadge Adam Warner 2016-11-03 07:49:30 +00:00
  • 933973b12c Merge pull request #898 from pi-hole/fix/removeCC Adam Warner 2016-11-03 07:48:36 +00:00
  • 5b54b9cb11 update Pihole fixture comment diginc 2016-11-03 00:05:19 -05:00
  • d2f815bba7 no longer need to write bash test scripts diginc 2016-11-03 00:02:28 -05:00
  • a5a067d50f switching testinfra's Docker run from dash to bash diginc 2016-11-02 23:58:54 -05:00
  • 699e299345 add a comment about bash vs dash. future refact needed diginc 2016-11-02 23:40:50 -05:00
  • 05e114173d update comments, add configureFirewall test diginc 2016-11-02 23:25:13 -05:00
  • d958b3ff65 Remove CodeClimate yaml, Travis new ShellChecker Dan Schaper 2016-11-02 20:14:04 -07:00
  • 0d7e06a141 remove old pytest output file diginc 2016-11-02 22:13:39 -05:00
  • 633095aee1 switch to consistent style diginc 2016-11-02 22:13:05 -05:00
  • a4aeb9a1dd Update README.md Dan Schaper 2016-11-02 20:07:51 -07:00
  • 71005e1db3 Merge with change of spacing in development Eric Warnke 2016-11-02 19:01:34 -04:00
  • d7d6d6f991 Update to use new Var name Promofaux 2016-11-02 21:46:30 +00:00
  • 5986121cfc Merge pull request #896 from pi-hole/bugfix/649 Adam Warner 2016-11-02 21:27:45 +00:00
  • c452a4569e .js Promofaux 2016-11-02 21:17:00 +00:00
  • a182a208dc Tidy up output Promofaux 2016-11-02 21:06:12 +00:00
  • d273b4b48b Check for missing index.html, replace if missing. Promofaux 2016-11-02 20:57:56 +00:00
  • afed7d4af0 Merge pull request #890 from pi-hole/feature/defensiveTweaks Adam Warner 2016-11-02 20:23:04 +00:00
  • b429e890ad move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails Promofaux 2016-11-02 20:16:36 +00:00
  • 2f976504e8 switch out -eq for == Promofaux 2016-11-02 20:06:21 +00:00
  • b5fc88227b Merge .gitignore Dan Schaper 2016-11-02 12:36:00 -07:00
  • 4b7b859db9 Gotta catch 'em all...' Dan Schaper 2016-11-02 12:29:55 -07:00
  • f7d0de53bb Compare string to string. Dan Schaper 2016-11-02 12:11:34 -07:00
  • 603ec997ba Remove testing block. Dan Schaper 2016-11-02 12:09:33 -07:00
  • 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. Dan Schaper 2016-11-02 12:07:59 -07:00
  • 3d43e1568c Use explicit calls for function to self-document Dan Schaper 2016-11-02 11:39:22 -07:00
  • 3cf6a65da9 Remove *.yml ignoring Dan Schaper 2016-11-02 11:32:53 -07:00
  • c1a3f003e8 Rename the only utilty function left that didn't say repo Dan Schaper 2016-11-02 11:18:13 -07:00
  • 3f61aea7fc Utility functions fully quiet now. Calling functions have the echos. Dan Schaper 2016-11-02 11:09:53 -07:00
  • bd68db51e0 ShellCheck split local declaration and assignment. Dan Schaper 2016-11-02 11:01:50 -07:00
  • b8a5ed710e Take echos out of utility functions and move up a level. Dan Schaper 2016-11-02 10:51:09 -07:00
  • 34be601dd7 Test for lexicographically less than tag version. Dan Schaper 2016-11-02 10:42:05 -07:00
  • 1d64ad1ccd Stash all changed files, clean directory and pull updates. Dan Schaper 2016-11-02 10:39:27 -07:00
  • dfb4ac0365 Keep .yml's from going to user local repos. Dan Schaper 2016-11-02 09:52:15 -07:00
  • f2d7a3d26d Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks Dan Schaper 2016-11-02 09:48:00 -07:00
  • 6d415a7384 Merge pull request #894 from diginc/InstallFixes_UnitTests Dan Schaper 2016-11-02 09:42:20 -07:00
  • 0ef8832b04 whitespace Dan Schaper 2016-11-02 09:36:30 -07:00
  • e42a037b7d Grep -i instead of cat. Dan Schaper 2016-11-02 09:28:00 -07:00
  • fe18d69b65 Grep should start at the beginning of line to make sure it doesn't fire on # beginning lines. Dan Schaper 2016-11-02 09:25:32 -07:00
  • a1a9a7fa9e Clarify which DNS entry we are modifying. Dan Schaper 2016-11-02 08:52:23 -07:00
  • 07029f93e3 Match team convention in naming. Dan Schaper 2016-11-02 08:34:56 -07:00
  • e99ef9c093 Cap the variables and echo out the proper environment. Dan Schaper 2016-11-02 08:22:45 -07:00
  • fef9ab674e Pi-hole CORE installer variables are being changed to standardize scripts. Dan Schaper 2016-11-02 07:53:02 -07:00
  • ee37c37cab fix update output logic. version number variables should not be read only! Adam Warner 2016-11-02 14:29:20 +00:00
  • b636c1e1f8 Whitespace. Dan Schaper 2016-11-02 07:00:43 -07:00
  • 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks Dan Schaper 2016-11-02 06:57:33 -07:00
  • a6cbd5a2fd Merge pull request #895 from pi-hole/Feature/defensiveTweaks Adam Warner 2016-11-02 13:42:24 +00:00
  • ece1667fb0 Refactor and move some bits. Dan Schaper 2016-11-02 06:41:51 -07:00
  • 50bd8b4a09 Further tweaks to local repo handling Adam Warner 2016-11-02 13:34:57 +00:00
  • 93d91353a1 All tabs now spaced Dan Schaper 2016-11-02 05:49:33 -07:00
  • 8dc9143b34 Just delete, no need to cd there first. Dan Schaper 2016-11-02 05:45:29 -07:00
  • a0d9a1133c Factoring and combining functions Dan Schaper 2016-11-02 05:34:39 -07:00
  • 7740e4268c Consistency and standards basic-install start. Dan Schaper 2016-11-02 05:17:28 -07:00
  • f36e4ba336 Cherry picking 3f049fa79, conflict fix Adam Warner 2016-11-02 09:35:48 +00:00
  • 3df2ef8587 Cherry picking f6f6f6d, conflict fix Adam Warner 2016-11-02 09:33:17 +00:00
  • 354309fcad set QUERY_LOGGING default to true Adam Warner 2016-11-01 16:46:54 +00:00
  • e832bfc61e Merge branch 'feature/defensiveTweaks' of github.com:pi-hole/pi-hole into feature/defensiveTweaks Dan Schaper 2016-11-02 04:22:29 -07:00
  • 99057ed859 Update var names from setupVars.conf in gravity.sh Adam Warner 2016-11-01 09:47:31 +00:00
  • c47c5e466f consistency Adam Warner 2016-11-01 09:48:21 +00:00
  • edd00e8e70 consistency Adam Warner 2016-11-01 09:45:22 +00:00
  • 82e7de2aaa Account for variable name changes Adam Warner 2016-11-01 09:36:59 +00:00
  • b723714c0c Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names Adam Warner 2016-11-01 09:33:39 +00:00
  • a2903b6e63 Consistency Adam Warner 2016-11-01 09:32:57 +00:00
  • 9a1876571b Prototype whiptails so they don't fall to shell. Need to do this to all functions. Dan Schaper 2016-10-31 16:55:10 -07:00
  • c07d7165ab Global variables CAP'ed Dan Schaper 2016-10-31 16:49:40 -07:00
  • d695c5972f local variables just to be safe and make sure they stay in this function. Dan Schaper 2016-10-31 16:48:58 -07:00
  • bbc09ed313 Swap variable names. Dan Schaper 2016-10-31 16:48:02 -07:00
  • 1d21b0da9a enable or disable logging from pihole command Promofaux 2016-10-31 22:02:20 +00:00
  • 617a147706 Wording adjustment Promofaux 2016-10-31 21:40:20 +00:00
  • d4dccfdb2d Cherry pick 229439c Promofaux 2016-10-31 21:38:48 +00:00
  • 035e4bf727 Move value checks to if calls. Dan Schaper 2016-11-02 03:55:04 -07:00
  • 9ec5bbd560 Actually get is_repo to return a value and have it expected. Dan Schaper 2016-11-02 03:38:35 -07:00
  • 34482c5ed6 Modified is_repo Dan Schaper 2016-11-02 03:09:59 -07:00
  • 7d414b5628 Move version messages to main function, check for repos. Dan Schaper 2016-11-02 01:12:02 -07:00
  • d9528dfd09 Bash is funny with returns. Dan Schaper 2016-11-02 00:51:38 -07:00
  • 12f5f8ba00 Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code. Dan Schaper 2016-11-02 00:14:25 -07:00
  • db0f3307e0 Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs. Dan Schaper 2016-11-01 22:48:30 -07:00
  • 9c83825cb8 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks Dan Schaper 2016-11-01 22:20:32 -07:00
  • 7a22471787 New naming convention, and reorder functions as bash would prefer them to be. Dan Schaper 2016-11-01 22:19:40 -07:00
  • 7548d9a8fe point shellcheck at update.sh instead diginc 2016-11-01 23:56:46 -05:00
  • 26789f9b36 add travis and python requirements diginc 2016-11-01 23:53:11 -05:00
  • b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests diginc 2016-11-01 23:52:20 -05:00
  • 6605c269cf Merge pull request #893 from diginc/feature/defensiveTweaks Dan Schaper 2016-11-01 21:35:20 -07:00
  • c30478bf4a cleanup and use sentintel in is_repo diginc 2016-11-01 23:21:50 -05:00
  • d986746ef9 missing quote added diginc 2016-11-01 23:02:50 -05:00
  • a8fa061f2e quote all the assignments prevent accidental glob splitting diginc 2016-11-01 23:02:06 -05:00