arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 15:28:07 +00:00
Code Issues Releases Wiki Activity
1,612 Commits 11 Branches 109 Tags 20 MiB
ca9321624c
Commit Graph

1612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Schaper
e42a037b7d Grep -i instead of cat. 2016-11-02 09:28:00 -07:00
Dan Schaper
fe18d69b65 Grep should start at the beginning of line to make sure it doesn't fire on # beginning lines. 2016-11-02 09:25:32 -07:00
Dan Schaper
a1a9a7fa9e Clarify which DNS entry we are modifying. 2016-11-02 08:52:23 -07:00
Dan Schaper
07029f93e3 Match team convention in naming. 2016-11-02 08:34:56 -07:00
Dan Schaper
e99ef9c093 Cap the variables and echo out the proper environment. 2016-11-02 08:22:45 -07:00
Dan Schaper
fef9ab674e Pi-hole CORE installer variables are being changed to standardize scripts. 2016-11-02 07:53:02 -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
Adam Warner
a6cbd5a2fd Merge pull request #895 from pi-hole/Feature/defensiveTweaks 
Further tweaks to local repo handling
 2016-11-02 13:42:24 +00: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
7740e4268c Consistency and standards basic-install start. 2016-11-02 05:17:28 -07:00
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