Commit Graph

480 Commits

Author SHA1 Message Date
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 7a22471787 New naming convention, and reorder functions as bash would prefer them to be. 2016-11-01 22:19:40 -07: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
Eric Warnke fb5ac6d6d7 We should prefer the php metapackage if it's there, falling back on php5 if it's not 2016-10-31 21:31:13 -04:00
Eric Warnke 4e7ca51beb Added dependancy for ping and lsof used in debug scripts 2016-10-31 21:24:57 -04:00
Eric Warnke 65e0fcbf10 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-28 13:14:00 -04:00
Dan Schaper e22aca49c8 Merge pull request #813 from das7pad/development
Create missing directory for lighttpd
2016-10-28 10:05:08 -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
Promofaux 794fa21137 install uninstall.sh... 2016-10-27 12:44:21 +01:00
Eric Warnke 977d1d1998 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-27 07:37:40 -04:00
Promofaux cde003bc98 \ all the /s! 2016-10-27 11:13:00 +01:00
Adam Warner 3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
Improvements to White and Blacklists
2016-10-26 19:52:16 +01:00
Eric Warnke 3a4fe3e391 Wheezy install fix by selecting appropriate deps, made the php check the same 2016-10-26 14:47:29 -04:00
Eric Warnke 4ed6e4d016 Tiny screens get sane minimums 2016-10-26 11:15:02 -04:00
Eric Warnke ac8d24a1ce Even with no detected screen size, it should presume 80x24 2016-10-26 11:14:54 -04:00
Eric Warnke fc776921d5 stty is more compatible and does not require any additional dependancies for busybox 2016-10-26 11:14:46 -04:00
Adam Warner 55a653aca4 clear out /opt/pihole folder before installing scripts 2016-10-26 10:00:00 +01:00
Adam Warner bd0db56ba0 actually fix up logic 2016-10-25 15:29:02 +01:00
Adam Warner 95f0b3710d fix up logic 2016-10-25 15:27:13 +01:00
Adam Warner 86349527e7 replace HOSTNAME tokens in 01-pihole.conf 2016-10-25 15:06:37 +01:00
Adam Warner 911053f63f Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution. 2016-10-25 15:00:18 +01:00
Marcus Hildum 519d731ddd Fix missing newline
My mistake
2016-10-23 16:45:51 -07:00
Marcus Hildum ec4f5007e7 remove bad { 2016-10-21 23:59:31 -07:00
Marcus Hildum 21b906e0e0 Consistency
More of the same
2016-10-21 23:57:47 -07:00
Marcus Hildum 7ebaf8e843 Consistency
Now with block indents!
2016-10-21 23:23:31 -07:00
Marcus Hildum 28eeaf201b Standardize function declaration
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical

myfucn() {
}

style.
2016-10-19 19:47:45 -07:00
Jakob Ackermann 8872594ab9 create upload dir for lighttpd
directory is missing in the installation process but is used in the
lighttpd.conf
2016-10-19 14:27:17 +02:00
Adam Warner ff5d5b97c3 stash any changes in local repo 2016-10-18 13:54:09 +01:00
Dan Schaper ef3c13fe2b Refire with curl 2016-10-17 19:22:56 -07:00
bcambl fb9664b636 fix typo 2016-10-16 15:11:47 -06:00
bcambl ee114b3075 use an excluded extension for ifcfg backup 2016-10-16 13:28:14 -06:00
Promofaux 5792fc0bef change wording depending on choice 2016-10-16 17:23:26 +01:00
Promofaux 42c93917ef bug I forgot to fix before piholeUpdate was merged to development 2016-10-16 17:19:44 +01:00
Adam Warner df30a4c0d1 Merge pull request #779 from bcambl/fedora_fixes
Fedora fixes
2016-10-16 15:46:50 +01:00
Adam Warner 9ce13f0035 Merge pull request #790 from pi-hole/piholeUpdate
Various refactoring.
2016-10-15 23:51:07 +01:00
Promofaux 3884b01503 Forgot a ` ` 2016-10-15 23:21:13 +01:00
Promofaux a84c3adeab if uniformity then dan = happy 2016-10-15 23:19:26 +01:00
Promofaux a65b784907 repeat after me: repetition is a bit repetitive. 2016-10-15 21:26:41 +01:00
Promofaux 05dadad2e1 repair sounds better than refresh 2016-10-15 21:22:46 +01:00
Promofaux 3a9b39b842 adjust text in update_dialogs() whiptail 2016-10-15 21:12:13 +01:00
Promofaux e612003293 handle arguments better, convert to flags, echo when they're set to true. 2016-10-15 20:52:20 +01:00
Promofaux a43577fa26 add reconfigure flag to -r command 2016-10-15 20:43:03 +01:00
Promofaux a6fa60868b spacing 2016-10-15 15:41:48 +01:00
Promofaux 99878ae7d6 reflect name change of some of the variables in setupVars 2016-10-15 15:40:12 +01:00
bcambl 26202014a2 stdout formatting 2016-10-12 20:35:08 -06:00
bcambl f4f8b96788 remove systemd selinux rules on init systems
fixes the failing SELinux policy compile on init based systems
2016-10-12 20:35:08 -06:00
bcambl e5ede16749 update yum/dnf package count grepfu
see pull #774
2016-10-12 20:33:13 -06:00
bcambl fbe3547129 EPEL is not required on Fedora
epel-release installs the EPEL package repository (Extra Packages for Enterprise Linux)
Dependencies from this repository should available by default on Fedora
2016-10-12 20:26:48 -06:00
diginc a03caea549 setupVar tests passing for debian & centos 2016-10-10 23:14:39 -05:00
Promofaux aa23fb1d56 choose* 2016-10-10 22:34:12 +01:00
Dan Schaper 570611fc09 CentOS Firewall fix 2016-10-10 11:30:15 -07:00
Dan Schaper 94dd5b1ebe More CentOS fixes. 2016-10-10 11:05:29 -07:00
Dan Schaper 74524e024d Always check PIHOLE_dependencies. 2016-10-10 10:36:19 -07:00
Dan Schaper e42b6dcc8e create_pihole_user update @diginc. 2016-10-10 09:21:28 -07:00
Dan Schaper d71b799e75 More cleanups, localize variables, clean formatting. 2016-10-10 08:23:14 -07:00
Dan Schaper 87e7121332 Gravity.sh checks for null value for variables, obliging that expectation. 2016-10-10 07:32:16 -07:00
Dan Schaper 94f6354c94 Spinner blocks `set -e` trying to get it in functions that won't crash out... 2016-10-10 07:25:43 -07:00
Dan Schaper b79059ebdb Start to add the spinner back in! 2016-10-10 06:46:30 -07:00
Dan Schaper 4f98c1bebb Boolean operators inside quotes don't work well... 2016-10-10 06:16:00 -07:00
Dan Schaper 2feec01e10 Add `start_service` and `enable_service` functions to handle restating services and setting services to start on reboot. 2016-10-10 06:06:34 -07:00
Dan Schaper 72b95e192e Fix logic bug in `setup_user`, update how setupVars are sourced so they will only be used if the user selects `update` and not if they select `install`. 2016-10-10 05:45:37 -07:00
Dan Schaper 47aad254d8 localized some more variables 2016-10-10 03:56:03 -07:00
Dan Schaper bc14074d2a Tighten up Update Whiptail appearance. 2016-10-10 03:39:32 -07:00
Dan Schaper 5ab5b1a190 Overhaul dnsmasq version 3 way handshake configuration files. 2016-10-10 03:23:52 -07:00
Dan Schaper b055f190f5 Factor out interfaces detection. 2016-10-10 03:16:22 -07:00
Dan Schaper 84b8953352 Remove quiet flags from package managment variables. Set quiets in functions by redirecting output. 2016-10-10 02:58:38 -07:00
Dan Schaper 93a591d487 Linting from ShellCheck 2016-10-10 02:57:04 -07:00
Dan Schaper e6c0f38a7c Monolithic changes in one commit again. 2016-10-10 02:24:03 -07:00
Dan Schaper f107ae4f9b Merge conflict resolution 2016-10-10 09:08:25 +00:00
Dan Schaper bad7a08804 Refactor and rename `create_pihole_user`. Now to actually use the user created... 2016-10-10 01:51:19 -07:00
Dan Schaper 25cbf4cb35 Factor out legacy location script removal. 2016-10-10 01:43:10 -07:00
Dan Schaper 7f179f9a58 Remove sourcing bash completion, would fall off as soon as the subshell terminated. 2016-10-10 01:40:56 -07:00
Dan Schaper 5287ea8537 Refactor `stopServices` into `stop_service` and accept arguments for service to stop. Quiet output from a few other functions. 2016-10-10 01:25:11 -07:00
Dan Schaper 43e2aaebf0 rename `updateDialogs` to `update_dialogs` 2016-10-10 01:04:59 -07:00
Dan Schaper e60eb66283 UpdateDialogs are now a Whiptail Menu, self-explanatory. 2016-10-10 01:04:03 -07:00
Dan Schaper ca59b808d8 Git clone/update now occurs right after installer dependency checks. Allows for inclusion of installer source files in the repo. Passes `set -e` 2016-10-10 00:02:50 -07:00
Dan Schaper 8a15fd44d5 Update `is_repo()` to use `git status` for validity checks. 2016-10-09 23:53:18 -07:00
Dan Schaper dac2b8942e Typo fix to generate commit. 2016-10-09 22:38:00 -07:00
Dan Schaper 54a1c5b63a Revert inadvertent commits
IDLE keeps committing direct to development.
2016-10-09 22:35:14 -07:00
Dan Schaper 61b02bf6d3 Add OR TRUE to PKG_COUNT so that a 0 package to update doesn't grep -c to an exit value of 1. 2016-10-09 22:27:37 -07:00
Dan Schaper 9d048b2fdf Move Pi-hole dependency checks to `main()` and out of duplicated `install` and `update` functions. Bring them up a level in the subshells. 2016-10-09 22:24:13 -07:00
Dan Schaper d9e28a7422 factor out `installer_dependencies` 2016-10-09 22:05:06 -07:00
Dan Schaper 1fecdf42ca Move `git` to installer deps, refactor some functions. 2016-10-09 22:00:23 -07:00
Dan Schaper d4bf85b67c Self contain `package_check` into `package_check_install`. Passes `set -e` test. 2016-10-09 21:44:45 -07:00
Dan Schaper 7131ff27c3 Attempt to `set -e` 2016-10-09 21:32:25 -07:00
Dan Schaper a30f78c1c8 Oneliner php version check, passes `set -e` check. 2016-10-09 21:31:36 -07:00
Dan Schaper 7e0afffca8 Revert inadvertent commits 2016-10-09 19:41:32 -07:00
Dan Schaper 293c60fb9c Exit script on failure to install dependent package. 2016-10-09 13:52:36 -07:00
Dan Schaper f5be8b2a5e Single dependency package check function, will exit if any errors with message to update cache. 2016-10-09 13:43:01 -07:00
Dan Schaper 6772603c15 Relocate cache check to its own function 2016-10-09 12:34:53 -07:00
Jacob Salmela a22904f99b Merge pull request #769 from pi-hole/Fix/PackageCacheFresh
Fix/package cache fresh
2016-10-09 09:00:52 -05:00
Dan Schaper b157bc5cd7 Fixes #768 Check the staleness of the package index instead of the package cache. 2016-10-08 13:47:35 -07:00
Dan Schaper 10e1a03c76 `runGravity` is called after `finalExports` in the Debian install side. 2016-10-08 12:58:42 -07:00
Dan Schaper d20df92e9f Script will now run as root, removed `sudo` from function calls. 2016-10-08 12:56:26 -07:00
Dan Schaper 44170207ac Add `main` function and fire script from `main` call. Prevents script from running before it is entirely downloaded. 2016-10-08 12:17:04 -07:00
Dan Schaper 33745be745 Merge pull request #753 from pi-hole/feature/RemoveBarePHP
Remove bare php package from dependencies
2016-10-07 21:32:07 -07:00
Adam Warner 6a28070017 Too many `-`s 2016-10-07 13:09:27 +01:00
Dan Schaper 91b948332e Merge pull request #754 from pi-hole/fix/bashConditional
fix/bashConditional
2016-10-07 03:42:22 -07:00
Dan Schaper d1a7fe2d44 fix/bashConditional 2016-10-07 03:36:34 -07:00
Dan Schaper c39324d11f Remove bare php package from dependencies
`php5` package can trigger install of Apache2. Without this package in deps, PHP is still installed and operational.
2016-10-07 00:24:25 -07:00