ci: don't overwrite the old packages

Signed-off-by: Sam Therapy <sam@samtherapy.net>

.drone.yml

@@ -11,9 +11,16 @@ steps:
       # Need >= 5.4.0, which isn't in the repos
       - wget http://ftp.us.debian.org/debian/pool/main/r/reprepro/reprepro_5.4.1-1_amd64.deb && dpkg -i ./reprepro_5.4.1-1_amd64.deb
       - rm ./reprepro_5.4.1-1_amd64.deb
+
       - bash ./prepare-pages.sh
-      - mkdir -p /pkg/repo
-      - mv repo /pkg/repo/apt
+
+      - git clone -b pages https://git.froth.zone/packages/awl /pkg
+      # delete stuff that either does not matter or will get overwritten
+      - rm -rf /pkg/.git
+      # overwrite anything that already exists, and merge the folders that don't
+      - yes | cp -rlPaf repo/* /pkg/apt
+      # Remove (this isn't needed but makes me feel better)
+      - rm -rf repo/
     environment:
       TAG: ${TAG}
     volumes:
@@ -26,7 +33,7 @@ steps:
       remote_url:
         from_secret: URL
       target_branch: pages
-      pages_directory: /pkg/repo
+      pages_directory: /pkg
       user_name: Sam Therapy
       user_email: sam@samtherapy.net
     volumes: