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
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
Promofaux
eec14be10d
add $SUDO into spinner control.
2016-01-24 21:19:23 +00:00
Promofaux
c179936b54
add $SUDO
2016-01-24 20:49:37 +00:00
Promofaux
649a565801
run apt-get install as sudo when resolving dependencies
2016-01-24 20:35:24 +00:00
Promofaux
2d4ebf5eb5
FIX CONFLICTS
2016-01-24 20:29:22 +00:00
Promofaux
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
Promofaux
9f0927351d
Merge from #236
2016-01-24 18:49:25 +00:00
Promofaux
736edf44e4
Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today
2016-01-24 17:53:27 +00:00
Promofaux
8a74942da7
Cleaned up output before running gravity.sh
2016-01-24 16:41:11 +00:00
Promofaux
2fe42138c7
removed a space
2016-01-24 16:37:15 +00:00
Promofaux
1563146918
improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade
2016-01-24 16:33:53 +00:00
Promofaux
cf3aea8075
uncomment the apt-get update/upgrade!
2016-01-24 15:27:40 +00:00
Promofaux
6cea480210
Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway.
2016-01-24 03:31:12 +00:00
Promofaux
206717828b
Improve spinner function.
2016-01-23 22:25:30 +00:00
Chad Howell
316d26ede2
Add unzip to the dependencies
...
unzip is required for the install script to complete. Some distros do
not have it installed by default.
2016-01-23 16:29:52 -05:00
Promofaux
e8b8fb0835
s
2016-01-23 00:23:32 +00:00
Promofaux
6663ced38d
Initial commit
2016-01-23 00:13:16 +00:00
Dan Schaper
ea0fb15ff2
Move creation of pihole directory out of IPv6 function
2016-01-22 19:48:55 +00:00
Adam Warner
05a59b17be
Changed URLs in installScripts() to match new organisation links
2016-01-22 16:50:01 +00:00
Kenneth Koski
ce578534fe
Fixing minor typos in basic-install.sh
2016-01-21 11:33:49 -06:00
Promofaux
3f40a95929
Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled
2016-01-20 23:34:18 +00:00
Promofaux
5c25c42da8
Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html
2016-01-20 22:14:17 +00:00
Promofaux
96011bc2ae
make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder.
2016-01-20 22:02:54 +00:00
Promofaux
4f59577fd1
Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root
2016-01-20 21:20:52 +00:00
Promofaux
bc51f88805
Check if any list.* files exist from previous installation, if they do delete them.
2016-01-19 22:52:29 +00:00
jacobsalmela
0a0f00da3b
fixes #169
...
exits if sudo is not installed when run as a regular user
2016-01-16 14:10:03 -06:00
jacobsalmela
5d608a2db5
leave system cron alone
...
Taking JoshKastang’s idea from #153 , the system cron file will be left
alone and the pihole.cron gets its own.
2016-01-16 13:48:29 -06:00
jacobsalmela
7c6ef0cfd0
privileged install
...
This puts sudo in a variable if run as a regular user. If already
running as root, the script proceeds as normal. Not a perfect fix, but
should help for install on other systems.
2016-01-16 13:40:09 -06:00
Jacob Salmela
0cf859344a
Merge pull request #176 from xd1936/patch-1
...
Install Figlet Fonts with Toilet
2016-01-16 13:19:15 -06:00
