mirror of https://github.com/pi-hole/pi-hole
development
abp_query
tests_systemd
fix_FTLcheckUpdate
development-v6
fix/privay_level
master
fix/lighttpd_fastcgi-promo
test_fastcgi_config
no_static
fix/lighttpd_fastcgi2-electric_boogaloo
awk
tests_systemd_new
docker-versions
tweak/test-conditions
tweak/processdnssettings
FTLDNS
FTLDNS-systemd
v4.3.2
2.0
2.8
V2.5.1
V2.9.1
V2.9.2
v2.1
v2.10
v2.10.1
v2.10.2
v2.11
v2.11.1
v2.11.2
v2.12
v2.12.1
v2.13
v2.13.1
v2.13.2
v2.2
v2.3
v2.4
v2.5
v2.5.2
v2.5.3
v2.6
v2.6.1
v2.6.1.1
v2.6.1.2
v2.6.2
v2.6.3
v2.7
v2.7.1
v2.8.1
v2.9
v2.9-alpha
v2.9.3
v2.9.4
v2.9.4a
v2.9.5
v3.0
v3.0.1
v3.1
v3.1.4
v3.2
v3.2.1
v3.3
v3.3.1
v4.0
v4.1
v4.1.1
v4.2
v4.2.1
v4.2.2
v4.3
v4.3.1
v4.3.3
v4.3.4
v4.3.4int
v4.3.5
v4.4
v5.0
v5.1
v5.1.1
v5.1.2
v5.10
v5.11
v5.11.1
v5.11.2
v5.11.3
v5.11.4
v5.12
v5.12.1
v5.12.2
v5.13
v5.14
v5.14.1
v5.14.2
v5.15
v5.15.1
v5.15.2
v5.15.3
v5.15.4
v5.15.5
v5.2
v5.2.1
v5.2.2
v5.2.3
v5.2.4
v5.3
v5.3.1
v5.4
v5.5
v5.6
v5.7
v5.8
v5.8.1
v5.9
v5.9.1
${ noResults }
3 Commits (master)
Author | SHA1 | Message | Date |
---|---|---|---|
![]() |
ecde222512 |
[Staging] 3.1 (#1502)
* Fix handling of wildcard help text * Rewrite help text for better handling of params * Replace misleading letter variable * stash changes on branch switch, else it fails if any changes have been made. * Make changes according to comment in #1384 * Update queryFunc() * Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}` * scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`) * Remove unused processWildcards() function * Return a message if no domain is specified * IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour * Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330) * Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file) * queryFunc() will not return "(0 results)" output from files where no match is found * Sort results based off list number * Return a message if no results are found * Update basic-install.sh * Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten * simplify * further simplify * fix inteliJ IDEA complaints * even further simplify * tidy up output * revert line, looks tidyer * clarify * Revert "Ensure any changes to blocking page are updated." * We test for dpkg lock on line 830 directly, no need for the check also in the template section. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> * Display FTL version & version.sh rewrite While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option. I've had the following things in mind while rewriting this: * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0) * I have modified the help text to only output with `pihole -v --help` * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::") Testing output: ``` w3k@MCT:~$ pihole -v Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1) Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1) FTL version is v2.6.2 (Latest: v2.6.2) w3k@MCT:~$ pihole -v -c Current Pi-hole version is v3.0.1-14-ga928cd3 Current Admin Console version is v3.0-9-g3760482 Current FTL version is v2.6.2 w3k@MCT:~$ pihole -v -l Latest Pi-hole version is v3.0.1 Latest Admin Console version is v3.0.1 Latest FTL version is v2.6.2 w3k@MCT:~$ pihole -v -p --hash Current Pi-hole hash is |
6 years ago |
![]() |
7a1a2dec67
|
update license to EUPL on core files
|
6 years ago |
![]() |
60b2ad6519 |
Initial commit
|
9 years ago |