Jacob Salmela
5f00347019
appease shellcheck by removing two unneccesary functions and making some if/else blocks
2017-06-26 21:34:39 -05:00
Mcat12
89a22ded54
Merge pull request #1564 from pi-hole/fix/ipv6-cidr
...
Fix gravity generation when IPv6 CIDR is present
2017-06-26 10:04:06 -04:00
Mcat12
1e31fa89aa
Remove /* from IPv6 as well as IPv4
...
Fixes Discourse issue: https://discourse.pi-hole.net/t/ipv6-aaaa-dns-issue/3830
2017-06-26 09:51:21 -04:00
Dan Schaper
b477b7f777
Merge pull request #1539 from mterron/patch-1
...
Add support for PowerPC architecture
2017-06-25 19:37:23 -07:00
Mcat12
0de15f7a97
Merge branch 'development' into patch-1
2017-06-25 18:15:33 -04:00
Mcat12
35ecf40259
Merge pull request #1545 from pi-hole/dschaper-patch-1
...
Update PULL_REQUEST_TEMPLATE.md
2017-06-25 18:13:30 -04:00
Mcat12
009363a7bb
Merge pull request #1560 from pi-hole/fix/ad-domain-hostname
...
Move local.list after the ad blocking lists
2017-06-25 18:11:48 -04:00
Mcat12
a3758612ec
Merge pull request #1556 from pi-hole/fix/invalid-ipv6-wildcard
...
Fix wildcarding with IPv6
2017-06-25 18:09:26 -04:00
Mcat12
8dc94e014f
Merge branch 'development' into fix/invalid-ipv6-wildcard
2017-06-25 18:04:38 -04:00
Dan Schaper
ad886ac164
Merge branch 'development' of github.com:pi-hole/pi-hole into dschaper-patch-1
2017-06-25 15:03:56 -07:00
Mcat12
78e7c8b8e9
Merge branch 'development' into fix/ad-domain-hostname
2017-06-25 18:03:16 -04:00
Dan Schaper
3779085051
Merge pull request #1562 from pi-hole/tweak/shellcheck
...
Tweak ShellCheck Tests
2017-06-25 14:45:45 -07:00
Dan Schaper
c29c4ceb0f
Integrate DL's update.sh fixes.
...
`shellcheck -x` for following files.
Do not test for included files SC1091
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-06-25 14:39:09 -07:00
Dan Schaper
07fc047dd8
Remove testing for debug as this is getting a re-write by Jacob.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-06-25 12:26:16 -07:00
Mcat12
bc46694ea7
Move local.list after the ad blocking lists
...
Fixes the bug found by [Reddit](https://www.reddit.com/r/pihole/comments/6j3az9/urls_in_my_blacklist_are_showing_up_as_my_default/ )
2017-06-25 12:18:09 -04:00
Dan Schaper
0c2827e130
Test exclusion for sourced files SC1090.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-06-24 15:49:16 -07:00
Mcat12
cb09e0bc9a
Strip /* from the end of the IPv6 address
...
Fixes #1536
2017-06-24 11:14:23 -04:00
Dan Schaper
06d5ea9d51
Grammar and signoff instructions.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-06-22 12:59:07 -07:00
Dan Schaper
a4650c6226
Update PULL_REQUEST_TEMPLATE.md
2017-06-21 08:26:59 -07:00
Dan Schaper
c85a603491
Update PULL_REQUEST_TEMPLATE.md
2017-06-21 08:19:19 -07:00
Adam Warner
536585b846
Colourise Core Output Text ( #1471 )
...
* Define colours within COL_TABLE
* Do not output colours for non-terminal instances
* Removed ":::"
* Fixed indenting & spacing
* Made output consistent throughout project
* Reworded text to fit on standard 80 char wide Terminal screen
* Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi
* Make "Installation/Update Complete" the final msg
* Remove redundant messages
* Simplify update available message
* Confirm user would like to begin uninstall
* If "git pull" string says "Already up-to-date.", place [i] before it
* Colour Temp/Interface output
* Made `pihole disable 5z` invalid
* Added error fallback if invalid argument (not s/m) is detected
* Quoted "$2" for consistency
* Updated help text
* L185/286: Replaced echo with redirect
* User agents for adblock.mahakala.is/adaway.org unnecessary
* Print newline on confirmation of repository reset
* Add output to admin-related dnsmasq restarts
* Return error message for "pihole -q"
* Imply default checkout behaviour with y/N
* Fix uninstall failing to remove pihole user
* Print checkout 'git remote show origin' STDERR on new line
* Replaced checkout "AdminLTE" wording with "Web Admin"
2017-06-21 21:49:05 +10:00
Terror
5b472ff67c
Add support for PowerPC architecture
...
Related to https://github.com/pi-hole/FTL/pull/88
2017-06-20 08:28:04 +12:00
Mcat12
6f2ec22894
Merge pull request #1534 from pi-hole/new/black.list
...
Introducing black.list
2017-06-19 14:26:08 -04:00
DL6ER
05798fe07a
cp + rm === mv (well, almost)
2017-06-19 20:22:03 +02:00
Mcat12
8ab5ffd876
Merge pull request #1533 from pi-hole/dschaper-patch-1
...
Change from admin to approvers teams
2017-06-17 12:23:04 -04:00
Mcat12
2b6709d83f
Merge pull request #1532 from pi-hole/fix/tempfiles
...
Delete temporary files after installing the FTL binary. Fixes #1525
2017-06-17 12:07:00 -04:00
DL6ER
e4cc5b3847
Disable black.list on "pihole disable"
2017-06-17 14:49:02 +02:00
DL6ER
8bad56e897
Improve displayed messages and overall logic
2017-06-17 14:24:30 +02:00
DL6ER
92e691408f
Remove useless cat
2017-06-17 14:14:07 +02:00
DL6ER
0a9c234127
Add "pihole -g -b" to *only* update black.list (saves a bunch of time when adding/changing only blacklisted files - won'tdownload lal lists, but only processes the blacklist and restars dnsmasq)
2017-06-17 13:57:27 +02:00
DL6ER
0283a1ab74
Introduce new file black.list for blacklist content
2017-06-17 13:50:10 +02:00
Dan Schaper
b32096b16e
Change from admin to approvers teams
2017-06-17 03:59:27 -07:00
DL6ER
3d7582faec
Delete temporary files after installing the FTL binary. Fixes #1525
2017-06-17 08:54:26 +02:00
DL6ER
54a88ab5ab
Change ownership of /etc/pihole to user/group pihole. Fixes #1529 ( #1530 )
2017-06-17 08:43:05 +02:00
WaLLy3K
aff5ff08d5
Trim version output when update is successful ( #1527 )
2017-06-15 09:50:05 +02:00
Jacob Salmela
fc0440546f
add functions to parse head and tails of gravity.list and pihole.log
2017-06-10 23:20:27 -05:00
Jacob Salmela
172b8d2427
parse ftl log
2017-06-10 22:18:33 -05:00
Jacob Salmela
6d10a498a5
implement a limit on how many lines of a file we want to view
2017-06-10 21:57:17 -05:00
Jacob Salmela
881819ed5f
ignore big files we dont need to know about; also fix diagnosing pihole processes
2017-06-10 18:37:28 -05:00
Jacob Salmela
3275c5f710
more comments to help understand the script
2017-06-10 15:54:27 -05:00
Jacob Salmela
b0cc1a38c3
adjust minor formatting for better readability
2017-06-10 15:28:04 -05:00
Mcat12
e8025dbc81
Merge pull request #1513 from pi-hole/EUPLv1.2
...
Update LICENSE of the project to EUPL v1.2
2017-06-10 14:10:25 -04:00
Jacob Salmela
e10182c839
only parse files required by Pi-hole
2017-06-10 12:27:05 -05:00
Jacob Salmela
b4f1fe08f0
variablize all files and directories. also put required files and folders into an arry so we can compare them in later functions by parsing through them
2017-06-09 23:22:37 -05:00
Jacob Salmela
64171fa2a1
small color and formatting changes
2017-06-09 15:42:54 -05:00
Jacob Salmela
048eacd305
parse array in correct location
2017-06-07 12:31:08 -05:00
Jacob Salmela
24aa72c19d
condense repetative code into functions; parse the content of each file
2017-06-07 12:25:00 -05:00
Jacob Salmela
92b5fe4be4
check arch compatibility and add gateway faq url
2017-06-05 14:55:58 -05:00
DL6ER
939055f19c
Revert "Add FTL tests to the test suite ( #1510 )" ( #1519 )
...
This reverts commit cf6a1ac9ad
2017-06-05 13:51:13 +02:00
Mcat12
c47f3e3307
Merge pull request #1517 from pi-hole/tweak/update_core_and_FTL
...
Don't update FTL when there is a core update
2017-06-04 08:42:59 -04:00
