152 commits

Author	SHA1	Message	Date
Promofaux	1b76bf3e48	Merge branch 'UninstallFix' of github.com:pi-hole/pi-hole into UninstallFix	2016-02-11 16:27:16 +00:00
Promofaux	5eff32f578	Loop through dependencies as with install, offer user a choice to keep or remove them.	2016-02-11 16:26:57 +00:00
Promofaux	6ff2b04dfb	Merge github.com:pi-hole/pi-hole into UninstallFix	2016-02-11 14:49:46 +00:00
Mcat12	8ef60dde9c	Fixed some formatting in the installer	2016-02-10 18:52:26 -05:00
Mcat12	a1c55a64cb	Merge branch 'development' into UninstallFix	2016-02-10 18:49:28 -05:00
Promofaux	255706e173	Bring dev branch up to date with master bug fixes	2016-02-09 20:44:49 +00:00
Sergio G	beb6b950f7	Replaced 'sudo' with	2016-02-08 22:26:41 +01:00
Promofaux	315b99e011	Merge branch 'development' into UninstallFix	2016-02-06 13:08:58 +00:00
Promofaux	2d1c0be24e	fix reference to install log location. #282	2016-02-06 13:04:54 +00:00
Promofaux	9941651b3c	Addresses changes as requested by @jacobsalmela in #282	2016-02-06 13:02:21 +00:00
Adam Warner	0f262a4237	Remove /etc/.pihole directory	2016-02-05 14:48:29 +00:00
Adam Warner	55eec5cfd0	delete 01-pihole.conf, not dnsmasq.conf!	2016-02-05 14:34:55 +00:00
Adam Warner	c93c4cc5e6	Update basic-install.sh ... ahem	2016-02-01 22:28:35 +00:00
Promofaux	06cba7defd	Fix script output around new changes	2016-02-01 22:25:28 +00:00
Promofaux	8b76bbe51d	Merge github.com:pi-hole/pi-hole	2016-02-01 22:19:37 +00:00
Promofaux	aa1d3a4c2e	Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98	2016-02-01 22:19:17 +00:00
Dan Schaper	38e73a188a	Fix array selection	2016-02-01 02:11:55 +00:00
Dan Schaper	3fdf588cc9	Costmetic fixes, change DynDNS to OpenDNS	2016-02-01 02:09:11 +00:00
Promofaux	70e4104c17	Merge remote-tracking branch 'origin/development'	2016-01-31 20:47:10 +00:00
Promofaux	29e0e1760b	Fixes #154 #269. No need for PR #214 any more.	2016-01-31 20:39:12 +00:00
Chad Howell	5060ed8970	Add error checking for grep and correct typos	2016-01-30 20:51:28 -05:00
Dan Schaper	d18e064d21	Remove no longer needed change to config file ... Config file moved, no longer needed command removed.	2016-01-30 16:30:38 -08:00
Mcat12	0cfb3c7ab4	Fixed config issue	2016-01-30 19:21:31 -05:00
Mcat12	48f9a61ff0	Updated License	2016-01-30 15:12:40 -05:00
Mcat12	0042e3ae02	Merge branch 'development' into CBH/UpstreamDNS ... Conflicts: automated install/basic-install.sh	2016-01-30 13:28:01 -05:00
Adam Warner	b93e46de14	Update basic-install.sh	2016-01-30 14:55:02 +00:00
Promofaux	9e0c7ed29a	Merging from CBH bugfix	2016-01-30 14:34:12 +00:00
Adam Warner	21a07e7419	Merge pull request #263 from pi-hole/newVersioning ... New versioning system	2016-01-29 20:47:10 +00:00
Adam Warner	6b50ea6504	Merge pull request #249 from pi-hole/OperationBlockListFromGravity ... Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades	2016-01-29 19:39:11 +00:00
Mcat12	895647b908	Don't copy version to install dir	2016-01-29 12:32:58 -05:00
Mcat12	0ece58b9cb	Add version	2016-01-29 12:23:03 -05:00
Mcat12	49a56cf131	Start on new versioning	2016-01-29 08:25:35 -05:00
Dan Schaper	cadc506aa5	Remove extraneous whitespace from basic-install.sh	2016-01-28 09:25:00 +00:00
Chad Howell	088bd632ab	Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function ... # Conflicts: # automated install/basic-install.sh	2016-01-27 22:43:43 -05:00
PromoFaux	60bf14d4dd	Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix ... Force apt-get update if it has not been run today. This will stop dependency errors on a fresh install.	2016-01-27 23:43:38 +00:00
Promofaux	c00fb44cee	Do not force apt-get upgrade on the user. Instead, advise them. We only need to make sure apt-get update has been run	2016-01-27 23:28:36 +00:00
Promofaux	3d78b44a8e	Changes as in #253, but with less commits to keep the repo tidy	2016-01-27 22:32:08 +00:00
Promofaux	701ae06e4a	Move copying of adlists.default to gravity.sh	2016-01-27 21:14:06 +00:00
PromoFaux	98a0d17431	Update basic-install.sh ... Emergency Bug fix. I take the blame for this one, it got lost in a merge!	2016-01-27 15:28:40 +00:00
Chad Howell	ae336da7a1	Fix formatting, use consistent style, add comments ... Fix formatting, use consistent style, add comments	2016-01-27 01:11:38 -05:00
Promofaux	ef99fe2d18	Add line to copy default ad list into /etc/pihole	2016-01-26 20:33:49 +00:00
PromoFaux	80bec9c5cf	Delete install ... Not sure how this got in here... :)	2016-01-25 16:28:26 +00:00
Adam Warner	2b99fa81f3	Tidy up output lines around new code	2016-01-25 16:08:48 +00:00
Adam Warner	354a42dd00	close quotes on line 318!!!	2016-01-25 12:49:04 +00:00
Adam Warner	4cedca3427	add in a prompt to give users the option to quit installation or continue	2016-01-25 12:47:03 +00:00
Dan Schaper	e99be28a73	Variable missing $	2016-01-25 02:31:03 -08:00
Dan Schaper	32389e4ab8	Terminate string with missing quote	2016-01-25 02:27:44 -08:00
Adam Warner	01d7fc0ac9	Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218	2016-01-25 10:07:12 +00:00
Chad Howell	d74c8261aa	dnsFile2="/etc/dnsmasq.conf.orig" ... added .orig	2016-01-25 01:38:41 -05:00
Chad Howell	ac373545d0	versionCheckDNSmasq() fixups ... versionCheckDNSmasq() fixups per dschaper's suggestions.	2016-01-25 01:27:10 -05:00