diff options
author | Subhaditya Nath <56714626+subnut@users.noreply.github.com> | 2021-12-02 23:46:11 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-02 23:46:11 +0300 |
commit | ba6d700e7e46dce79f44fea3339193ee80164f1a (patch) | |
tree | 1c26bb8737084f4f6a6927a41c801ee5d54ddc19 /pihole | |
parent | e485a7b9bb3da8e0ab7ccb5b16caac07ba70782d (diff) |
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>
Diffstat (limited to 'pihole')
-rwxr-xr-x | pihole | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -95,8 +95,7 @@ uninstallFunc() { versionFunc() { shift - "${PI_HOLE_SCRIPT_DIR}"/version.sh "$@" - exit 0 + exec "${PI_HOLE_SCRIPT_DIR}"/version.sh "$@" } # Get PID of main pihole-FTL process |