From 3b8b3593566e41601133b7416c7afd367e1e1160 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 14:56:21 +0330
Subject: [PATCH] last try

---
 .gitlab-ci.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ace9737..aa39c06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,24 +4,29 @@ stages:
 
 image: archlinux/archlinux:base-devel
 
+variables:
+  Desktop: "cosmic"
+
 archiso:
   stage: build
   script:
     - ./build.sh
     - echo "Renaming the output ISO file"
-    - mv out/*.iso out/ParchLinux-cosmic-latest.iso
+    - mv out/*.iso out/Parchlinux-$Desktop-latest.iso
   rules:
     - if: $CI_COMMIT_TAG  
 
 deploy:
   stage: deploy
   script:
-    - echo "Installing sshpass"
+    - echo "Installing sshpass and rsync"
     - pacman -Syu --noconfirm sshpass rsync
-    - echo "Deleting old ISO files from remote directory"
-    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT "rm -f /srv/http/cosmic/*.iso"
-    - echo "Deploying new ISO via rsync"
-    - sshpass -p "$PASS" scp -o StrictHostKeyChecking=no out/*.iso parch@$SSH_ROOT:/srv/http/cosmic
+    - echo "Removing old ISO files from remote directory"
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf /srv/http/cosmic/
+    - echo "Creating new directory on remote host"
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/cosmic/
+    - echo "Uploading new ISO via rsync"
+    - sshpass -p "$PASS" rsync -r "$(ls out/*.iso)" parch@SSH_ROOT:/srv/http/cosmic/
   rules:
     - if: $CI_COMMIT_TAG  
   dependencies: