1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 22:28:18 +00:00
pi-hole/advanced
WaLLy3K 03201e2f20 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 a928cd3
w3k@MCT:~$ pihole -v -a --hash
  Current Admin Console hash is 3760482
w3k@MCT:~$ pihole -v --help
Usage: pihole -v [REPO | OPTION] [OPTION]
Show Pi-hole, Web Admin & FTL versions
  <Shows all Repositories and Options>
w3k@MCT:~$ pihole -v -foo
  Invalid Option!
```
2017-05-10 13:07:56 +10:00
..
bash-completion Pi-hole checkout feature 2017-03-08 13:16:40 +01:00
GIFs Multiple gif files to choose from 2015-06-06 23:29:54 -05:00
Scripts Display FTL version & version.sh rewrite 2017-05-10 13:07:56 +10:00
01-pihole.conf Add localise-queries flag to 01-pihole.conf 2017-04-30 13:47:07 +02:00
blockingpage.css Add whitelisting on blocking page feature 2016-12-30 12:03:45 +00:00
cmdline.txt consoleblank=0 2016-02-20 01:15:14 -06:00
console-setup file to set lcd font size 2016-01-23 11:48:12 -06:00
dnsmasq.conf.original remove trailing whitespace dnsmasq.conf.original 2016-03-05 21:14:17 -08:00
index.js no need for the X- header prefix in the string 2016-03-14 22:59:38 -05:00
index.php Merge pull request #1297 from raincoats/development 2017-04-26 12:35:19 -07:00
lighttpd.conf.debian update license to EUPL on core files 2017-02-22 11:55:20 -06:00
lighttpd.conf.fedora update license to EUPL on core files 2017-02-22 11:55:20 -06:00
logrotate Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1) 2017-01-29 19:58:53 +01:00
pihole-FTL.service Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running 2017-04-12 15:12:09 +02:00
pihole.cron update license to EUPL on core files 2017-02-22 11:55:20 -06:00
pihole.sudo update license to EUPL on core files 2017-02-22 11:55:20 -06:00