From 1e6b35f078fc3f13fa6e7c353f1f32dd9452f170 Mon Sep 17 00:00:00 2001 From: Jarvis Date: Sat, 19 Sep 2026 16:48:13 -0500 Subject: [PATCH 1/3] fix: make updates.sh path-independent and fix InfluxData keyring usage - updates.sh: use BASH_SOURCE to find script dir, so fix_apt_influx.sh can be called from anywhere (was failing with 'command not found' when run from outside the updates_scripts directory) - fix_apt_influx.sh: if key download fails but keyring already exists on disk, reuse it with [signed-by=] instead of falling back to [trusted=yes] which disables signature verification entirely - Fixes: Missing key AC10D7449F343ADCEFDDC2B6DA61C26A0585BD3B error on Trixie when running updates.sh --- updates_scripts/fix_apt_influx.sh | 12 +++++++++--- updates_scripts/updates.sh | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) mode change 100644 => 100755 updates_scripts/fix_apt_influx.sh mode change 100644 => 100755 updates_scripts/updates.sh diff --git a/updates_scripts/fix_apt_influx.sh b/updates_scripts/fix_apt_influx.sh old mode 100644 new mode 100755 index 1f2e759..f6d79f8 --- a/updates_scripts/fix_apt_influx.sh +++ b/updates_scripts/fix_apt_influx.sh @@ -31,9 +31,15 @@ if [ -s /tmp/influxdata-archive.key ]; then echo "deb [signed-by=/usr/share/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main" \ | sudo tee /etc/apt/sources.list.d/influxdata.list >/dev/null else - # Fallback: use trusted=yes (signature verification disabled) - echo "deb [trusted=yes] https://repos.influxdata.com/debian stable main" \ - | sudo tee /etc/apt/sources.list.d/influxdata.list >/dev/null + # Fallback: use existing keyring if already present + if [ -f /usr/share/keyrings/influxdata-archive.gpg ]; then + echo "deb [signed-by=/usr/share/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main" \ + | sudo tee /etc/apt/sources.list.d/influxdata.list >/dev/null + else + # Last resort: trusted=yes (signature verification disabled) + echo "deb [trusted=yes] https://repos.influxdata.com/debian stable main" \ + | sudo tee /etc/apt/sources.list.d/influxdata.list >/dev/null + fi fi echo "==> Fixing Sury PHP repo key" diff --git a/updates_scripts/updates.sh b/updates_scripts/updates.sh old mode 100644 new mode 100755 index 183f57d..431aa8f --- a/updates_scripts/updates.sh +++ b/updates_scripts/updates.sh @@ -1,5 +1,6 @@ #!/bin/bash -sudo ./fix_apt_influx.sh +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +sudo "$DIR/fix_apt_influx.sh" sudo apt update sudo apt upgrade -y From a71faf5b9a5991fb4a1cb14114ac5b7e887267f5 Mon Sep 17 00:00:00 2001 From: WickedYoda <68271168+wickedyoda@users.noreply.github.com> Date: Sat, 19 Sep 2026 16:57:06 -0500 Subject: [PATCH 2/3] Update keyring check to use -s instead of -f Change condition to check if the keyring file is not empty before using it. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- updates_scripts/fix_apt_influx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updates_scripts/fix_apt_influx.sh b/updates_scripts/fix_apt_influx.sh index f6d79f8..e7e7a85 100755 --- a/updates_scripts/fix_apt_influx.sh +++ b/updates_scripts/fix_apt_influx.sh @@ -32,7 +32,7 @@ if [ -s /tmp/influxdata-archive.key ]; then | sudo tee /etc/apt/sources.list.d/influxdata.list >/dev/null else # Fallback: use existing keyring if already present - if [ -f /usr/share/keyrings/influxdata-archive.gpg ]; then + if [ -s /usr/share/keyrings/influxdata-archive.gpg ]; then echo "deb [signed-by=/usr/share/keyrings/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main" \ | sudo tee /etc/apt/sources.list.d/influxdata.list >/dev/null else From 29486f408c6af46d54b65fc1cd1fe7e9956fd10c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 19 Sep 2026 21:57:46 +0000 Subject: [PATCH 3/3] fix: rename updates script dir variable for clarity Co-authored-by: wickedyoda <68271168+wickedyoda@users.noreply.github.com> --- updates_scripts/updates.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/updates_scripts/updates.sh b/updates_scripts/updates.sh index 431aa8f..2afe28f 100755 --- a/updates_scripts/updates.sh +++ b/updates_scripts/updates.sh @@ -1,6 +1,6 @@ #!/bin/bash -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -sudo "$DIR/fix_apt_influx.sh" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +sudo "$SCRIPT_DIR/fix_apt_influx.sh" sudo apt update sudo apt upgrade -y