ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 90 Packages Projects Releases Wiki Activity
7,037 Commits 10 Branches 126 Tags
ec8df55f0d9d8dddac80a19e3a82e32aa775ecb0
Commit Graph

69 Commits

Author SHA1 Message Date
Christian König
ec8df55f0d Set versions in /etc/pihole/versions to null if script fails
Some checks are pending
CodeQL / Analyze (pull_request) Waiting to run
Details
Test Supported Distributions / smoke-tests (pull_request) Waiting to run
Details
Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (alpine_3_23) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (centos_10) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (centos_9) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (debian_11) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (debian_12) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (debian_13) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (fedora_40) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (fedora_41) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (fedora_42) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (fedora_43) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Blocked by required conditions
Details
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Blocked by required conditions
Details 
Signed-off-by: Christian König <github@yubiuser.dev>
 2026-02-23 11:33:06 +01:00
Christian König
ca1bab3c1b Fix more shellcheck warnings 
Signed-off-by: Christian König <github@yubiuser.dev>
 2025-04-07 10:52:57 +02:00
Adam Warner
2088601148 Add .shellcheckrc to configure shellcheck ignore SC1090-1 globally 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-04-06 18:46:47 +01:00
Adam Warner
4108c817dc Revert "source with source not dot (#6137)" 
This reverts commit 8fd2ebd3d7, reversing
changes made to 557bc6f179.
 2025-04-04 19:12:57 +01:00
Michael Woolweaver
4efe4dfd4b source with source not dot 
Signed-off-by: Michael Woolweaver <michael@woolweaver.bid>
 2025-04-02 14:21:45 -05:00
XhmikosR
45cb722e50 version.sh: fix typo in comment 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2025-03-06 21:40:17 +02:00
Adam Warner
f193edd428 Merge branch 'development' into development-v6-merge-development (resolved conflicts) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-02-09 19:22:53 +00:00
Christian König
c3c31a1a60 Print version details automatically if not on master 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-09 23:14:58 +01:00
Christian König
fe4d934a40 Simplify pihole -v 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-09 23:13:04 +01:00
Christian König
6d02d4056f Rename option --admin to --web in version function 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-12-09 22:01:30 +01:00
Adam Warner
71357ecae7 adminlte->web 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-08 14:12:02 +01:00
Adam Warner
7886dc0172 adminlte->web 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-08 14:09:47 +01:00
Adam Warner
0e8f285f4f Always assume that the web interface will be installed. 
We could revist this again in future if we decide that there should still be a choice to install the interface or not

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-05-27 11:51:16 +01:00
Adam Warner
cdbe4c9b86 Get only the precise tag number when getting local version, do not show branch name when on master branch(es) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-11-14 20:39:34 +00:00
Christian König
52283478c8 Run pihole updatechecker if versions file is not found 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-14 13:26:06 +02:00
Christian König
9471c69882 Fix spelling 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-07 09:34:05 +02:00
Christian König
79c0b446e1 Set missing data to N/A 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 21:55:49 +02:00
Christian König
a478f2460b POSIX 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 21:50:07 +02:00
Christian König
2dc599f266 Simplify version.sh 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-10-06 17:58:58 +02:00
Adam Warner
a4b899c256 Review suggestions (and shellcheck complaints) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-23 19:10:12 +01:00
Adam Warner
5421aad03e Store versions as key/value pairs rather than space delimeted values 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-08-22 19:11:27 +01:00
Subhaditya Nath
ba6d700e7e Fix pihole -v output if WebAdmin not installed (#4370) 
* Fix https://github.com/pi-hole/pi-hole/issues/4279

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Don't ignore exit code of version.sh

If it exits with a non-zero return code, that means some error occurred,
and so it shouldn't be ignored.

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Implement changes suggested by @Michalng

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Implement changes suggested by @PromoFaux

Signed-off-by: Subhaditya Nath <sn03.general@gmail.com>

* Always source /etc/pihole/setupVars.conf

https://github.com/pi-hole/pi-hole/pull/4370#issuecomment-978149567

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-02 20:46:11 +00:00
jbzdarkid
bc8150adfa Clean up bash script formatting 
Done with the help of beautysh (a python-based bash formatter)

Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-11-25 14:12:09 -08:00
Adam Warner
5895690b58 this has been annoying me for months 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-04-24 15:38:27 +01:00
Dave Nicolson
ab753e88a2 Fix GitHub capitalisation 
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
 2020-05-13 12:55:00 +02:00
DL6ER
401c029dc4 Improve else condition of branch determination 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 16:08:32 +02:00
DL6ER
0343171703 Add correct displaying for detached HEAD state. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 08:54:28 +02:00
DL6ER
176fbaf83b Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-21 08:51:17 +02:00
Adam Warner
3cc9ba4ee8 stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk> 2020-04-18 12:57:06 +01:00
Adam Warner
6dc85c3527 Don't display branch name if it is on master. 
Prefer cached remote version over github API

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-18 12:51:04 +01:00
Adam Warner
851947bbf2 Add branch name to version output 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-04-13 20:58:46 +01:00
Mark Drobnak
ed5869646f Use source instead of dot for setupVars 
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2018-12-27 16:37:10 -05:00
Mcat12
be2d494fcf Don't show web version in pihole -v output if not installed 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2018-12-12 14:55:09 -05:00
Dan Schaper
328e7738d5 Space/Tab version.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-07-20 13:27:30 -07:00
WaLLy3K
30035ce1c2 Merge branch 'development' into tweak/help-output 2017-05-14 13:03:33 +10:00
WaLLy3K
3bd677c102 Show help for "pihole -v -h" 
* Indent output text
* Minor help text change
 2017-05-14 11:57:46 +10:00
WaLLy3K
b721ed49ab Update Help Output (#1467) 
* File consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals

* Standardise core help text

* Added help text for disable command
* Added help text for logging command

* Clean up

* Fixed certain new lines and spaces

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Admin help text

* Added help text for interface command

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces

* Formatting consistency

* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Blacklist help text

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting

* Cronometer help text

* Formatting consistency

* Fixed certain newlines and spaces
* Corrected indenting

* Checkout warning alteration

* Add checkout help text

* Corrected help output
 2017-05-14 11:11:44 +10:00
WaLLy3K
ea0a9ceb37 Provide remote hashes for version.sh 
* Provide remote hashes for comparison
 * Use double braces for all conditions (for consistency)
 * Suppress potential "cd" error output
 * Provide "not applicable" output upon any hash request for FTL
 2017-05-12 15:25:01 +10:00
WaLLy3K
c6596f2c54 Modified syntax to be valid for Shellcheck 2017-05-11 14:19:13 +10:00
WaLLy3K
2863308090 Minimise string duplication & other minor changes 
Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().
 2017-05-11 13:34:58 +10:00
WaLLy3K
7fef1fdc83 Fixed indentation 2017-05-11 10:11:04 +10:00
WaLLy3K
fe0a35cc7a Update -h to work as --hash 
Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093
 2017-05-11 08:30:49 +10:00
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
DL6ER
38ba079baa Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface 
Don't try to obtain version of web interface it it is not installed
 2017-03-10 14:33:12 +01:00
Dan Schaper
33f7979359 Merge pull request #1293 from pi-hole/fix/version 
Account for hash in versioning
 2017-03-10 14:32:52 +01:00
DL6ER
6dea00668e Don't try to obtain version of web interface it it is not installed. Fixes #1303 2017-03-07 13:08:01 +01:00
Dan Schaper
abd3e828de Optimize normalOutput 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 07:46:00 -08:00
DL6ER
b85af50d14 Generate only the information that is actually asked for 2017-03-04 14:08:11 +01:00
Dan Schaper
0e8fd49669 Function... 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 23:30:57 -08:00
Dan Schaper
945e22874e Collapse duplicate functions, and take out argument loops. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 23:12:28 -08:00