Commit Graph

1569 Commits

Author SHA1 Message Date
Adam Warner
f01e8c70d9 Weirldly, GHA missed these minor warnings however have disabled them as they are due to variables either being used in or declared in basic-install,.sh
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2025-04-06 14:11:40 +01:00
Adam Warner
f5dc337d1b In ./advanced/Scripts/piholeLogFlush.sh line 12:
source ${colfile}
       ^--------^ SC1090 (warning): ShellCheck can't follow non-constant source. Use a directive to specify location.

In ./advanced/Scripts/piholeLogFlush.sh line 16:
source "${utilsfile}"
       ^------------^ SC1090 (warning): ShellCheck can't follow non-constant source. Use a directive to specify location.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2025-04-06 14:11:40 +01:00
Adam Warner
63623c4353 In ./advanced/Scripts/piholeCheckout.sh line 112:
corebranches=($(get_available_branches "${PI_HOLE_FILES_DIR}"))
                      ^-- SC2207 (warning): Prefer mapfile or read -a to split command output (or quote to avoid splitting).

In ./advanced/Scripts/piholeCheckout.sh line 139:
        webbranches=($(get_available_branches "${webInterfaceDir}"))
                     ^-- SC2207 (warning): Prefer mapfile or read -a to split command output (or quote to avoid splitting).

In ./advanced/Scripts/piholeCheckout.sh line 170:
        ftlbranches=( $(git ls-remote https://github.com/pi-hole/ftl | grep "refs/heads" | cut -d'/' -f3- -) )
                      ^-- SC2207 (warning): Prefer mapfile or read -a to split command output (or quote to avoid splitting).

In ./advanced/Scripts/piholeCheckout.sh line 218:
            elif [ $? -eq 2 ]; then
                   ^-- SC2319 (warning): This $? refers to a condition, not a command. Assign to a variable to avoid it being overwritten.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2025-04-06 14:11:40 +01:00
Adam Warner
59d2177271 In ./advanced/Scripts/database_migration/gravity-db.sh line 18:
piholeDir="${2}"
    ^-------^ SC2034 (warning): piholeDir appears unused. Verify use (or export if used externally).

Turns out it is _actually_ unused, the full path of the gravity database is passed to the function, so we'll tidy this up rather than supressing.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2025-04-06 14:11:40 +01:00
Adam Warner
a624d3be8d In ./advanced/Scripts/utils.sh line 91:
if [[ $? -eq 5 ]]; then
     ^------------^ SC3010 (warning): In POSIX sh, [[ ]] is undefined.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2025-04-06 14:11:40 +01:00
Adam Warner
bdcb6fc88c Update update.sh, updatecheck.sh and uninstall.sh to honour pihole.to… (#5981) 2025-04-05 01:18:49 +01:00
Adam Warner
f403468450 Add webserver log to piholeLogFlush.sh (#6049) 2025-04-05 00:33:18 +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
James George
0f482396ee Update update.sh, updatecheck.sh and uninstall.sh to honour pihole.toml settings for webserver.paths.webroot and webserver.paths.webhome
When uninstalling, remove web interface parent directory empty check and possible removal.

Signed-off-by: James George <james.george@vigilantvoid.com>
2025-03-30 13:11:21 +08:00
yubiuser
3f5c00919b Remove WEB_CALL from COL_TABLE (#6062) 2025-03-10 06:14:47 +01:00
Christian König
5de9b6ae69 Add 2FA handling to api.sh
Signed-off-by: Christian König <github@yubiuser.dev>
2025-03-07 13:43:41 +01:00
Christian König
f3dc202e36 Remove WEB_CALL from COL_TABLE
Signed-off-by: Christian König <github@yubiuser.dev>
2025-03-07 10:16:25 +01:00
XhmikosR
45cb722e50 version.sh: fix typo in comment
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
2025-03-06 21:40:17 +02:00
Jack'lul
4df5c0bb96 Add webserver log to piholeLogFlush.sh
Signed-off-by: Jack'lul <8418678+jacklul@users.noreply.github.com>
2025-03-05 22:25:33 +01:00
Adam Warner
821c953216 Remove 'reconfigure' option (#5887) 2025-02-28 21:14:18 +00:00
Christian König
cadee26dba Improve dig error handlin in api.sh
Signed-off-by: Christian König <github@yubiuser.dev>
2025-02-22 13:48:55 +01:00
Christian König
c9e58adc48 DHCP discover timeout was reduced by FTL
Signed-off-by: Christian König <github@yubiuser.dev>
2025-02-10 20:41:18 +01:00
Christian König
d1639740d9 Fix database integrity check in debug log
Signed-off-by: Christian König <github@yubiuser.dev>
2025-02-10 20:29:05 +01:00
Christian König
49cf5bb221 Remove 'reconfigure' option
Signed-off-by: Christian König <github@yubiuser.dev>
2025-02-06 21:57:05 +01:00
Adam Warner
2ae78e02bd Add call to os_check in the update script (#5845) 2025-02-04 17:35:15 +00:00
RD WebDesign
254b67bca3 Using more user-friendly messages on git describe failure
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2025-01-13 20:11:41 -03:00
RD WebDesign
0ae50eab87 Suppress error message on git describe failure
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2025-01-12 20:25:32 -03:00
RD WebDesign
27fb2bbe3a Replace some hardcoded paths with pihole.toml values
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2025-01-09 19:11:22 -03:00
RD WebDesign
c78be8a89d No systemctl or service inside containers
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2025-01-09 19:11:22 -03:00
RD WebDesign
0590bbba2d Skip some checks in docker container
These commands always fail in containers with "command not found" (as expected).

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2025-01-09 19:11:21 -03:00
RD WebDesign
733dce1c4c If it's a docker container, consider the OS is supported
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2025-01-09 19:11:15 -03:00
RD WebDesign
bd9cc7cbb7 Clean up unused WEBCALL code
Debug Log is no longer available via web interface

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2025-01-09 17:15:12 -03:00
Adam Warner
bd9cb00574 Perform os_check during update, in case the user has updated to an unsupported OS between Pi-hole updates.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-31 15:31:04 +00:00
Christian König
3011d48b6f Use tail instead of parameter expansion
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-22 23:44:31 +01:00
Christian König
c777152c04 Only separat data and status when needed
Signed-off-by: Christian König <github@yubiuser.dev>
2024-12-22 21:57:47 +01:00
Dominik
4dbf9a0bbb Install dependencies by creating a meta package on-the-fly (#5785) 2024-12-14 08:33:15 +01:00
Christian König
c380c23592 Merge branch 'development' into packages 2024-12-11 18:34:34 +01:00
Adam Warner
764aa48c14 Remove no-longer-needed utils
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-12-11 17:22:49 +00:00
DL6ER
11e00e04b5 Fix ARP flush command
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-12-07 11:22:58 +01:00
Christian König
4137275f24 Merge branch 'development' into packages
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-17 21:13:16 +01:00
DL6ER
2dc5bd15cc Remove remaining traces of audit log
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-11-16 09:45:53 +01:00
Christian König
fd5b3be03f Create meta package on the fly ... Debian
Signed-off-by: Christian König <github@yubiuser.dev>
2024-11-06 20:11:56 +01:00
Christian König
8bf6480aed Set exit code explicitly everywhere
Signed-off-by: Christian König <github@yubiuser.dev>
2024-10-20 09:36:28 +02:00
Christian König
7ae0b207fc Exit 1 if update script failed
Signed-off-by: Christian König <github@yubiuser.dev>
2024-10-20 09:34:15 +02:00
Christian König
1ad135ad69 Do not print FTL update check details on pihole -up
Signed-off-by: Christian König <github@yubiuser.dev>
2024-10-18 22:30:22 +02:00
Christian König
bcc3a7e35e Show version information after an web only update
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-30 21:04:55 +02:00
DL6ER
d60ad57cac Add /etc/pihole/dnsmasq.conf to debug log (stripped-down version)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-09-09 21:37:34 +02:00
Christian König
333764a7c1 Account for renaming of devel branch on web repo
Signed-off-by: Christian König <github@yubiuser.dev>
2024-09-04 21:59:43 +02:00
DL6ER
b4444023a2 Wait after restarting FTL before trying to check version
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-09-02 15:54:27 +02:00
Dominik
e3fc5cc8f2 Make the help text of "pihole checkout [what] [branch]" more colorful (#5734) 2024-08-28 08:43:11 +02:00
Dominik
c26b043c58 Add pihole api [endpoint] callback suitable for local API requests (#5736) 2024-08-28 08:36:39 +02:00
Adam Warner
cfbf3f61cd Update advanced/Scripts/database_migration/gravity/16_to_17.sql
Co-authored-by: Dominik <DL6ER@users.noreply.github.com>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2024-08-26 21:30:12 +01:00
DL6ER
9e9c985245 FTL checkout: Check for availability of branches before trying to download from the webserver. Also, fix check_download_exists() possibly killing the script on non-availability of requested branches
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-08-26 06:11:42 +02:00
DL6ER
a302d7b5d7 Make the help text of "pihole checkout [what] [branch]" more colorful
Signed-off-by: DL6ER <dl6er@dl6er.de>
2024-08-26 05:22:15 +02:00