From 4d95b813bd8081a6a69554b92cb53daa62d78356 Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Tue, 25 Nov 2025 02:53:27 +1100
Subject: [PATCH] ci(apt): import packages one by one (#10938)

When importing packages into the APT repository, we need to do so
one-by-one. Moving packages using a glob-pattern confuses the CLI
because it wants to overwrite files it just created.

Current main:
https://github.com/firezone/firezone/actions/runs/19619491316/job/56177170625
This PR:
https://github.com/firezone/firezone/actions/runs/19619725967/job/56177805109
---
 scripts/sync-apt.sh | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/scripts/sync-apt.sh b/scripts/sync-apt.sh
index 9dfed6228..145e8779f 100755
--- a/scripts/sync-apt.sh
+++ b/scripts/sync-apt.sh
@@ -77,20 +77,11 @@ for DISTRIBUTION in "stable" "preview"; do
 
                 # Construct the proper filename
                 NORMALIZED_NAME="${PACKAGE}_${VERSION}_${ARCH}.deb"
-                NORMALIZED_PATH="${IMPORT_DIR}/${NORMALIZED_NAME}"
 
-                # Rename if needed
-                if [ "$(basename "$deb")" == "$NORMALIZED_NAME" ]; then
-                    continue
-                fi
-
-                echo "Renaming $(basename "$deb") → $NORMALIZED_NAME"
-                mv "$deb" "$NORMALIZED_PATH"
+                echo "Importing $(basename "$deb") as ${NORMALIZED_NAME}"
+                mv --force "$deb" "${POOL_DIR}/${NORMALIZED_NAME}"
             fi
         done
-
-        echo "Importing new packages..."
-        mv --force --target-directory="${POOL_DIR}/" "${IMPORT_DIR}"/**/*.deb
     fi
 
     if [ -z "$(ls -A "${POOL_DIR}")" ]; then