Commit Graph

446 Commits (dfb4ac03653f6b83a168dcb1b0976535921b18de)

Author SHA1 Message Date
Dan Schaper 6d415a7384 Merge pull request #894 from diginc/InstallFixes_UnitTests
8 years ago
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Adam Warner 50bd8b4a09 Further tweaks to local repo handling
8 years ago
Dan Schaper 7740e4268c Consistency and standards basic-install start.
8 years ago
Adam Warner 3df2ef8587 Cherry picking f6f6f6d, conflict fix
8 years ago
Adam Warner 354309fcad set QUERY_LOGGING default to true
8 years ago
Adam Warner edd00e8e70 consistency
8 years ago
Adam Warner 82e7de2aaa Account for variable name changes
8 years ago
Adam Warner b723714c0c Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names
8 years ago
Adam Warner a2903b6e63 Consistency
8 years ago
Dan Schaper 9a1876571b Prototype `whiptails` so they don't fall to shell. Need to do this to all functions.
8 years ago
Dan Schaper c07d7165ab Global variables CAP'ed
8 years ago
Dan Schaper d695c5972f `local` variables just to be safe and make sure they stay in this function.
8 years ago
Dan Schaper bbc09ed313 Swap variable names.
8 years ago
Promofaux 617a147706 Wording adjustment
8 years ago
Promofaux d4dccfdb2d Cherry pick 229439c
8 years ago
Dan Schaper d9528dfd09 Bash is funny with returns.
8 years ago
Dan Schaper 12f5f8ba00 Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code.
8 years ago
Dan Schaper db0f3307e0 Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs.
8 years ago
Dan Schaper 7a22471787 New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
diginc b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests
8 years ago
Eric Warnke 65e0fcbf10 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
8 years ago
Dan Schaper e22aca49c8 Merge pull request #813 from das7pad/development
8 years ago
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution
8 years ago
Promofaux 794fa21137 install uninstall.sh...
8 years ago
Eric Warnke 977d1d1998 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
8 years ago
Promofaux cde003bc98 \ all the /s!
8 years ago
Adam Warner 3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
8 years ago
Eric Warnke 3a4fe3e391 Wheezy install fix by selecting appropriate deps, made the php check the same
8 years ago
Eric Warnke 4ed6e4d016 Tiny screens get sane minimums
8 years ago
Eric Warnke ac8d24a1ce Even with no detected screen size, it should presume 80x24
8 years ago
Eric Warnke fc776921d5 stty is more compatible and does not require any additional dependancies for busybox
8 years ago
Adam Warner 55a653aca4 clear out /opt/pihole folder before installing scripts
8 years ago
Adam Warner bd0db56ba0 actually fix up logic
8 years ago
Adam Warner 95f0b3710d fix up logic
8 years ago
Adam Warner 86349527e7 replace HOSTNAME tokens in 01-pihole.conf
8 years ago
Adam Warner 911053f63f Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution.
8 years ago
Marcus Hildum 519d731ddd Fix missing newline
8 years ago
Marcus Hildum ec4f5007e7 remove bad {
8 years ago
Marcus Hildum 21b906e0e0 Consistency
8 years ago
Marcus Hildum 7ebaf8e843 Consistency
8 years ago
Marcus Hildum 28eeaf201b Standardize function declaration
8 years ago
Jakob Ackermann 8872594ab9 create upload dir for lighttpd
8 years ago
Adam Warner ff5d5b97c3 stash any changes in local repo
8 years ago
Dan Schaper ef3c13fe2b Refire with curl
8 years ago
bcambl fb9664b636 fix typo
8 years ago
bcambl ee114b3075 use an excluded extension for ifcfg backup
8 years ago
Promofaux 5792fc0bef change wording depending on choice
8 years ago
Promofaux 42c93917ef bug I forgot to fix before piholeUpdate was merged to development
8 years ago
Adam Warner df30a4c0d1 Merge pull request #779 from bcambl/fedora_fixes
8 years ago