Commit Graph

253 Commits

Author SHA1 Message Date
nate 69e8c014c3 Indentation fix 2016-04-03 17:25:48 -05:00
Promofaux 2d08217173 Tidy up For loops, clean up whitespace 2016-04-03 21:43:36 +01:00
Promofaux 36645d9335 Add check for existing files in /usr/local/bin left over from previous version, as those scripts are replaced with `pihole <command>` script. 2016-04-03 18:39:22 +01:00
Promofaux ad8573c739 Pedantic change, stops my editor from treating all of the code as one long sting in `' '` (as the `'` was escaped with `\`) 2016-04-03 18:10:50 +01:00
nate 71133f6b59 Spelling error fix... 2016-04-02 19:42:33 -05:00
nate 5d5d6c2c70 handle case where parent directories do not exist 2016-04-02 19:31:26 -05:00
nate 37fa462db5 Erraneous call to SUDO removed 2016-04-02 19:24:19 -05:00
nate 1a2046a7eb Added uninstall option to `pihole` command. Minor fixes 2016-04-02 19:20:54 -05:00
nate 3dff7e80fc Fixed path to /etc/bash_completion.d/ 2016-04-02 18:52:03 -05:00
nate 6eea9239a7 Merged branch development into PiHoleController 2016-04-02 18:41:36 -05:00
nate 75f1969bd2 Set executable permissions of `pihole` and changed installer to invoke sudo for gravity.sh.
Note: We invoke gravity.sh with sudo in other places, so ignore the removed comment.
2016-04-02 18:39:09 -05:00
nate 447af208b3 Fixed missing `cp` of `piholeDebug.sh` to /opt/pihole 2016-04-02 17:59:59 -05:00
nate d47fbbbe96 Mcat12 requests. Added bash-completion support 2016-04-02 17:58:10 -05:00
nate 28f2a1309e Merge branch 'development'
Conflicts:
	automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
nate f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development'
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
2016-03-29 12:57:22 -05:00
Nate fb5bc16c83 Call gravity.sh in it's new location 2016-03-29 00:14:56 -05:00
nate 456eee05f2 Added pihole.sh to /usr/local/bin
Uninstall.sh will handle removing the file
2016-03-28 18:55:37 -05:00
nate 00b65abd09 Minor changes to reflect new tool usage
Removed symlink of scripts to u/l/b
Added copy for setupLCD to /opt/pihole/
New spinner added to gravity.sh to reflect new spinner in basic-install.sh and uninstall.sh
2016-03-28 18:44:54 -05:00
nate 80f4bf9475 Bug fixes
Fixed DONE! to done!
Fixed symlinking user scripts
Fixed /n to \n
2016-03-28 16:20:23 -05:00
nate f444c7d4a5 Merge resolution 2016-03-28 12:21:49 -05:00
nate 8ef4c12f97 Merge branch 'ScriptCleanup'
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
2016-03-28 12:21:18 -05:00
nate c520c55ff4 Addressed UAT issues and moved scripts to /opt/pihole
Symlinks now include the /etc/pihole scripts in the user's PATH.
2016-03-28 10:24:13 -05:00
Nate 8c45bd32b7 Loop through dependencies for future expansion.
Syntax of uninstall script now matches basic-install.sh.
More error handling of missing default files.
Force user prompt for removing packages when uninstalling.
2016-03-27 12:31:05 -05:00
Nate 2b5cee05e6 Check for existing directory before trying to perform operations on it. 2016-03-27 10:59:09 -05:00
Nate 5442954db6 Prompt user to remove each dependent package if they do choose to remove packages at all. 2016-03-27 10:58:48 -05:00
nate 5ee382c8eb Roll back addition of piholeDebug.sh (production master base) 2016-03-26 17:00:52 -05:00
Nate 901cb44f5e Added /etc/.pihole/ and /var/log/*pihole* to uninstall as well as fixed missing call to removeNoPurge. 2016-03-26 16:57:34 -05:00
nate 0b9e78df2c Cleaned code and added prompt for purge on uninstall 2016-03-26 16:57:01 -05:00
Promofaux bc09760c84 Grab changes by @rosskevin. (#386 - lighttpd changes to handle JS files) 2016-03-24 23:19:44 +00:00
Promofaux 1e6ac33ef1 Fix merge conflicts 2016-03-24 23:18:14 +00:00
Adam Warner 02bb5b6742 Revert previous change
Reopens #384
2016-03-20 20:50:31 +00:00
Adam Warner fad5fafa32 Increase disk space to verify...
.. was missing a couple of zeros, and not verifying enough space!

Fixes  #384
2016-03-20 13:26:02 +00:00
nate 0b5f005a5d Added piholeDebug.sh script for advanced debugging
Script piholeDebug.sh added to /usr/local/bin to generate a detailed log file for debugging/troubleshooting.
2016-03-19 20:32:11 -05:00
Kevin Ross 404ea0ce6d copy both the html and js stubs during install 2016-03-14 22:54:45 -05:00
Carter Maxwell 4452f784a8 remove trailing whitespace basic-install.sh 2016-03-05 21:16:23 -08:00
Mcat12 adcd7f10ee Fixed password input 2016-02-28 15:24:38 -05:00
Mcat12 af83936047 Added password to install
Saves in password.txt
2016-02-28 15:18:48 -05:00
Adam Warner a0673c7028 Update basic-install.sh
Increase required free bytes.
2016-02-21 20:38:05 +00:00
Promofaux ca2d3a192c add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela 2016-02-21 18:38:34 +00:00
Promofaux 0ebb7eecdb Verify Custom DNS IP is a valid IP address 2016-02-20 17:33:20 +00:00
Promofaux 800d2f0859 Add back in whiptail dialog to verifyFreeDiskSpace() 2016-02-20 16:17:29 +00:00
Promofaux f397844603 Remove conflicted merge markup. Not sure how that got through. 2016-02-20 16:08:02 +00:00
Promofaux 2d895f328c Fix merge conflicts 2016-02-20 15:38:39 +00:00
Promofaux b14b182084 change regex to test for one or more numbers, not 0 or more numbers. 2016-02-20 15:17:57 +00:00
Promofaux 8687d25d88 make prepopulation of freetext on custom DNS provider a bit more intelligent 2016-02-20 15:12:13 +00:00
Promofaux 7001edcd1d Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs. 2016-02-20 15:00:03 +00:00
Mcat12 4a1e88f4bf Fixed Pi-hole user not being created 2016-02-20 09:48:06 -05:00
Promofaux b41608d40b Include fix for regex in verifyFreeDiskSpace() 2016-02-20 14:44:56 +00:00
Adam Warner 3e7ecda80f Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2
Add user pihole if user does not exsist
2016-02-19 09:31:41 +00:00
Daniel Fayette 8e289215b4 Account for CHIP pc not having root on '/' 2016-02-17 10:00:36 -06:00
Adam Warner c3c051385c Update basic-install.sh
Corrected mistake in previous commit
2016-02-17 12:42:31 +00:00
Promofaux c396aeed52 Correct miss-spelled variables on lines 398 and 403 2016-02-17 00:07:14 +00:00
Adam Warner 40f541bc31 update verifyFreeDiskSpace()...
addresses #322. Will now check free space on the first file system output by 'df- lkP`, as opposed to `/` to make pi-hole more compatible with other distros.
2016-02-16 23:00:48 +00:00
Daniel Fayette 432e6d5395 Cleaned up output, Fixed Cancel button 2016-02-16 16:47:36 -06:00
Daniel Fayette fdf805bc7b Merged with @slamanna212 code to add 3 new DNS providers. 2016-02-16 16:38:06 -06:00
slamanna212 da959e1296 Increased Size Of Whiptail Dialog
Increased Size of Whiptail Dialog to 5 to show all 5 DNS choices
2016-02-15 17:55:14 -05:00
slamanna212 94600c54cb Added Default State for New DNS Options
Added default state of off for 3 new DNS options to better match existing code
2016-02-15 17:54:17 -05:00
slamanna212 06444c1c27 Add 3 More DNS Server Choices Durring Install
Added Level 3 , Norton, and Comodo DNS Choices
2016-02-15 17:31:31 -05:00
Adam Warner 4d0b4cfb36 Update basic-install.sh
Do not stop dnsmasq when installing. Instead run `service dnsmasq restart` once installation is complete.
This may have been the cause of issues outlined in #218
2016-02-14 23:44:23 +00:00
Adam Warner 3c801e5b91 Merge pull request #301 from fayetted/Issue_163-2
Check for 25mb of free disk space before install
2016-02-14 13:29:07 +00:00
Daniel Fayette ecd46f8560 Allow installer to specify own DNS servers
Offers "other" option.
Gives Installer chance to review settings before continuing.
2016-02-13 22:36:24 -06:00
Mcat12 b5406240c6 Fixes IPv6 surviving a reinstall 2016-02-10 19:07:48 -05:00
Daniel Fayette 46d7bfecdb Check for 25mb of free disk space before install
Function will check the free space of / (root)

If the free space is less than 25MB it will give directions
  on how to expand the disk.

Fixes #163
2016-02-10 09:34:06 -06: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 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 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 eee0ccef8c Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2 2016-01-27 22:44:14 -05: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