From c055edab8f7b3ad9f76533d773a775d498a14f4b Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Sat, 18 Nov 2023 15:33:22 +0100
Subject: [PATCH] Moved all list files generation logic within the
 update-apt-repo step.

---
 .drone.yml | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9a69d0d72..26baf1605 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -514,16 +514,6 @@ steps:
         cp "$GIT_DEB" "$APT_ROOT/pool/$DEB_VERSION/main/$${PKG_NAME}_$${VERSION}-1_all.deb"
       fi
 
-    - |
-      cat <<EOF > "$TMP_APT_ROOT/platypush-oldstable-main.list"
-      deb https://apt.platypush.tech/ oldstable main
-      EOF
-
-    - |
-      cat <<EOF > "$TMP_APT_ROOT/platypush-oldstable-dev.list"
-      deb https://apt.platypush.tech/ oldstable dev
-      EOF
-
 ###
 ### Updates the APT repository after new packages have been pushed
 ###
@@ -626,16 +616,28 @@ steps:
         add_hashes "$dist_dir" "sha256sum" "SHA256" >> "$release_file"
       done
 
+    - echo "-- Generating list files"
+    - mkdir -p "$TMP_APT_ROOT/lists"
     - |
-      cat <<EOF > "$TMP_APT_ROOT/platypush-stable-main.list"
+      cat <<EOF > "$TMP_APT_ROOT/lists/platypush-stable-main.list"
       deb https://apt.platypush.tech/ stable main
       EOF
 
     - |
-      cat <<EOF > "$TMP_APT_ROOT/platypush-stable-dev.list"
+      cat <<EOF > "$TMP_APT_ROOT/lists/platypush-stable-dev.list"
       deb https://apt.platypush.tech/ stable dev
       EOF
 
+    - |
+      cat <<EOF > "$TMP_APT_ROOT/lists/platypush-oldstable-main.list"
+      deb https://apt.platypush.tech/ oldstable main
+      EOF
+
+    - |
+      cat <<EOF > "$TMP_APT_ROOT/lists/platypush-oldstable-dev.list"
+      deb https://apt.platypush.tech/ oldstable dev
+      EOF
+
     - echo "-- Updating index file"
     - |
       cat <<EOF > "$TMP_APT_ROOT/index.txt"
@@ -653,15 +655,15 @@ steps:
       1. Add this repository's PGP key to your apt keyring
       ====================================================
 
-      $ sudo wget -q -O \
-          /etc/apt/trusted.gpg.d/platypush.asc \
+      $ sudo wget -q -O \\
+          /etc/apt/trusted.gpg.d/platypush.asc \\
           https://apt.platypush.tech/pubkey.txt
 
       2. Add the repository to your sources
       =====================================
 
-      $ sudo wget -q -O \
-          /etc/apt/sources.list.d/platypush.list \
+      $ sudo wget -q -O \\
+          /etc/apt/sources.list.d/platypush.list \\
           https://apt.platypush.tech/lists/platypush-<deb_version>-<branch>.list
 
       Where:
@@ -673,8 +675,8 @@ steps:
 
       For example, to install the latest stable tags on Debian stable:
 
-      $ sudo wget -q -O \
-          /etc/apt/sources.list.d/platypush.list \
+      $ sudo wget -q -O \\
+          /etc/apt/sources.list.d/platypush.list \\
           https://apt.platypush.tech/lists/platypush-stable-main.list
 
       3. Update your repos