From 645f0625d5da61fac5583da5b46309f9af6dfb83 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 15 Jul 2024 11:07:19 +0330
Subject: [PATCH 01/34] added cosmic

---
 .github/workflows/build.yaml                  |  2 +-
 iso/airootfs/etc/mkinitcpio.conf              | 73 +++++++++++++++++++
 .../etc/mkinitcpio.conf.d/archiso.conf        |  2 -
 iso/airootfs/etc/mkinitcpio.d/linux.preset    |  6 +-
 iso/airootfs/etc/mkinitcpio.d/parchlinux      |  7 ++
 5 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 iso/airootfs/etc/mkinitcpio.conf
 delete mode 100644 iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf
 create mode 100644 iso/airootfs/etc/mkinitcpio.d/parchlinux

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2423a17..6e8f580 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Packages via Pacman
-        run: pacman -Sy; pacman --noconfirm -S git archiso python python-pygithub github-cli reflector p7zip  
+        run: pacman -Syu --noconfirm; pacman --noconfirm -S git archiso python python-pygithub github-cli reflector p7zip  
       - name: Change Arch docker mirror
         run: reflector -c "US" -f 12 -l 10 -n 12 --save /etc/pacman.d/mirrorlist
       - name: Build image
diff --git a/iso/airootfs/etc/mkinitcpio.conf b/iso/airootfs/etc/mkinitcpio.conf
new file mode 100644
index 0000000..9f5174a
--- /dev/null
+++ b/iso/airootfs/etc/mkinitcpio.conf
@@ -0,0 +1,73 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES=(usbhid xhci_hcd)
+MODULES=()
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run last, so it may be used to
+# override the actual binaries included by a given hook
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=(setfont)
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+FILES=()
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No RAID, lvm2, or encrypted root is needed.
+#    HOOKS=(base)
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS=(base udev autodetect modconf block filesystems fsck)
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS=(base udev modconf block filesystems fsck)
+#
+##   This setup assembles a mdadm array with an encrypted root file system.
+##   Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices.
+#    HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck)
+#
+##   This setup loads an lvm2 volume group.
+#    HOOKS=(base udev modconf block lvm2 filesystems fsck)
+#
+##   NOTE: If you have /usr on a separate partition, you MUST include the
+#    usr and fsck hooks.
+HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
+
+# COMPRESSION
+# Use this to compress the initramfs image. By default, zstd compression
+# is used. Use 'cat' to create an uncompressed image.
+COMPRESSION="zstd"
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+#COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+#COMPRESSION="lz4"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=()
+
+# MODULES_DECOMPRESS
+# Decompress kernel modules during initramfs creation.
+# Enable to speedup boot process, disable to save RAM
+# during early userspace. Switch (yes/no).
+#MODULES_DECOMPRESS="yes"
diff --git a/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf b/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf
deleted file mode 100644
index b4b3095..0000000
--- a/iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
-COMPRESSION="xz"
diff --git a/iso/airootfs/etc/mkinitcpio.d/linux.preset b/iso/airootfs/etc/mkinitcpio.d/linux.preset
index 7f51749..ffcd99b 100644
--- a/iso/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/iso/airootfs/etc/mkinitcpio.d/linux.preset
@@ -1,9 +1,5 @@
 # mkinitcpio preset file for the 'linux' package on archiso
-
 PRESETS=('archiso')
-
 ALL_kver='/boot/vmlinuz-linux'
-archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
-
+archiso_config='/etc/mkinitcpio.conf'
 archiso_image="/boot/initramfs-linux.img"
-
diff --git a/iso/airootfs/etc/mkinitcpio.d/parchlinux b/iso/airootfs/etc/mkinitcpio.d/parchlinux
new file mode 100644
index 0000000..a2ed6a9
--- /dev/null
+++ b/iso/airootfs/etc/mkinitcpio.d/parchlinux
@@ -0,0 +1,7 @@
+# mkinitcpio preset file for the kernel
+ALL_kver='/boot/vmlinuz-linux'
+#PRESETS=('default' 'fallback')
+PRESETS=('default')
+default_image="/boot/initramfs-linux.img"
+#fallback_image="/boot/initramfs-linux-fallback.img"
+#fallback_options="-S autodetect"

From 82d4ad132fda695e2c6dfe4fc464b470539ef196 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 15 Jul 2024 11:17:25 +0330
Subject: [PATCH 02/34] fixed pgp error

---
 iso/pacman.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iso/pacman.conf b/iso/pacman.conf
index c41fe45..4b2730c 100644
--- a/iso/pacman.conf
+++ b/iso/pacman.conf
@@ -38,7 +38,7 @@ CheckSpace
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
+SigLevel    = Never
 LocalFileSigLevel = Optional
 #RemoteFileSigLevel = Required
 

From 79286f1d43951faea3e5a2d7eb0e2b8782f5945b Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <72007820+behdanisohrab@users.noreply.github.com>
Date: Fri, 9 Aug 2024 11:18:38 +0330
Subject: [PATCH 03/34] Update packages.x86_64

---
 iso/packages.x86_64 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/iso/packages.x86_64 b/iso/packages.x86_64
index 02871cb..9a3ee42 100644
--- a/iso/packages.x86_64
+++ b/iso/packages.x86_64
@@ -141,7 +141,7 @@ boost
 sddm
 
 #Desktop
-cosmic-epoch-git
+cosmic-session-git
 
 #systemutils
 btop
@@ -151,8 +151,8 @@ fastfetch
 
 #ParchLinux Core Packages
 parch-welcome
-calamares-parch
-calamares
+calamares-parch-beta
+calamares-git
 os-prober
 paru
 parch-emoji-ios

From e550c510df0d3ba06515b5f08900f8cd3573a414 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 19 Aug 2024 14:21:00 +0330
Subject: [PATCH 04/34] Added Cosmic from extra

---
 README.md           | 11 +++++++++--
 iso/packages.x86_64 |  8 +++++---
 iso/pacman.conf     |  4 +---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0acc702..c5ee622 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,10 @@
-# Parch Linux iso template
+# Parch Linux Cosmic
 
-## Use this template for making releases
\ No newline at end of file
+Cosmic is a DE made by System76 in Rust and Iced.
+
+
+Parch Linux Cosmic features Cosmic DE with a Touch of Parch Linux itself.
+
+
+## Note:
+> currently cosmic is in alpha stage and it is not fully finished, use Parch Linux Cosmic only for testing.
diff --git a/iso/packages.x86_64 b/iso/packages.x86_64
index 9a3ee42..d283ff6 100644
--- a/iso/packages.x86_64
+++ b/iso/packages.x86_64
@@ -93,7 +93,6 @@ python
 python-psutil
 python-systemd
 refind
-#reflector
 reiserfsprogs
 rp-pppoe
 rsync
@@ -136,12 +135,15 @@ openssl
 gvfs
 gvfs-mtp
 networkmanager
-android-file-transfer
 boost
 sddm
 
 #Desktop
-cosmic-session-git
+cosmic
+
+#Essential Apps
+nheko
+firefox
 
 #systemutils
 btop
diff --git a/iso/pacman.conf b/iso/pacman.conf
index 4b2730c..2e5fe3e 100644
--- a/iso/pacman.conf
+++ b/iso/pacman.conf
@@ -98,9 +98,7 @@ Include = /etc/pacman.d/mirrorlist
 SigLevel = Optional TrustedOnly
 Server = https://raw.githubusercontent.com/parchlinux/pcp/main/x86_64/
 
-[chaotic-aur]
-SigLevel = Never
-Server = https://geo-mirror.chaotic.cx/$repo/$arch
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

From c331d57a93405db7dc3b0494af1047d5019f76e3 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Fri, 30 Aug 2024 23:18:57 +0330
Subject: [PATCH 05/34] updated iso

---
 iso/.gitlab-ci.yml  | 16 ++++++++++++++++
 iso/packages.x86_64 |  6 +++---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 iso/.gitlab-ci.yml

diff --git a/iso/.gitlab-ci.yml b/iso/.gitlab-ci.yml
new file mode 100644
index 0000000..4c38c5d
--- /dev/null
+++ b/iso/.gitlab-ci.yml
@@ -0,0 +1,16 @@
+stages:
+  - build
+
+image: archlinux/archlinux:base-devel
+
+archiso:
+  stage: build
+  script:
+    - ./build.sh
+  artifacts:
+    paths:
+      - out/*.iso
+    expire_in: 1 week
+
+rules:
+  when: manual
diff --git a/iso/packages.x86_64 b/iso/packages.x86_64
index d283ff6..c86c611 100644
--- a/iso/packages.x86_64
+++ b/iso/packages.x86_64
@@ -153,11 +153,11 @@ fastfetch
 
 #ParchLinux Core Packages
 parch-welcome
-calamares-parch-beta
-calamares-git
+calamares-parch
+calamares
 os-prober
 paru
 parch-emoji-ios
-vazirmatn-fonts
+ttf-vazirmatn
 parch-branding
 parch-pacman

From 055cce2cec3291ee7eec018ffdb76d380ee796ad Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Fri, 30 Aug 2024 23:19:58 +0330
Subject: [PATCH 06/34] updated iso

---
 iso/.gitlab-ci.yml => .gitlab-ci.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename iso/.gitlab-ci.yml => .gitlab-ci.yml (100%)

diff --git a/iso/.gitlab-ci.yml b/.gitlab-ci.yml
similarity index 100%
rename from iso/.gitlab-ci.yml
rename to .gitlab-ci.yml

From 5df46d809f660638766589b7c685a3b0ad6aec51 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Fri, 30 Aug 2024 23:21:10 +0330
Subject: [PATCH 07/34] updated iso

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c38c5d..a2a19a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,10 +7,11 @@ archiso:
   stage: build
   script:
     - ./build.sh
+  rules:
+  when: manual
   artifacts:
     paths:
       - out/*.iso
     expire_in: 1 week
 
-rules:
-  when: manual
+

From 1771a6f5e469aff26d9c92d928563698fd31e3f7 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 2 Sep 2024 23:58:29 +0330
Subject: [PATCH 08/34] trying to fix the CI/CD

---
 build.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index aa5da84..f21bad2 100755
--- a/build.sh
+++ b/build.sh
@@ -30,11 +30,11 @@ main() {
             echo -e "$Red### You are not in root$reset"
             exit 1
         else
+	    change_mirror
             install
             echo -e "$Blue### Install complete ###$reset"
             echo -e "$Green### Start build $reponame with archiso ###$reset"
             build
-            makezip
         fi
     else
         echo -e "$Red###OS can't supported###$reset"
@@ -42,19 +42,20 @@ main() {
     fi
 
 }
+
 install() {
     set -e
-    pacman -Sy; pacman --noconfirm -S --needed git archiso github-cli p7zip
+    pacman -Sy; pacman --noconfirm -S --needed git archiso github-cli p7zip reflector rsync
 }
+
+change_mirror() {
+	reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist
+}
+
 build() {
     set -e
     mkarchiso -v iso/
 }
-makezip() {
-    cd out
-    7z -v500m a "$(ls *.iso)".zip "$(ls *.iso)"
-    md5sum * > md5sums.txt
-}
 
 
 main

From 94b368a759ef24352a271e6b5e0b3a8432f2998b Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Tue, 3 Sep 2024 00:01:08 +0330
Subject: [PATCH 09/34] fixed typo in build.sh

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index f21bad2..0a1b186 100755
--- a/build.sh
+++ b/build.sh
@@ -30,11 +30,11 @@ main() {
             echo -e "$Red### You are not in root$reset"
             exit 1
         else
-	    change_mirror
             install
             echo -e "$Blue### Install complete ###$reset"
             echo -e "$Green### Start build $reponame with archiso ###$reset"
-            build
+            change_mirror
+	    build
         fi
     else
         echo -e "$Red###OS can't supported###$reset"

From e8479cd2e1f1192403e4d6fcbc731813ccf2f7f8 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Tue, 3 Sep 2024 00:52:41 +0330
Subject: [PATCH 10/34] force change mirror for testing

---
 build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 0a1b186..d1080c5 100755
--- a/build.sh
+++ b/build.sh
@@ -49,7 +49,8 @@ install() {
 }
 
 change_mirror() {
-	reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist
+	rm -rf /etc/pacman.d/mirrorlist
+	echo "Server = https://mirror.arvancloud.ir/archlinux/\$repo/os/\$arch" | sudo tee -a /etc/pacman.d/mirrorlist
 }
 
 build() {

From 04c3084b5e00d29570116d71fee8a35671888c32 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Thu, 5 Sep 2024 17:09:03 +0330
Subject: [PATCH 11/34] changed repo

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index d1080c5..9ecadcb 100755
--- a/build.sh
+++ b/build.sh
@@ -50,7 +50,7 @@ install() {
 
 change_mirror() {
 	rm -rf /etc/pacman.d/mirrorlist
-	echo "Server = https://mirror.arvancloud.ir/archlinux/\$repo/os/\$arch" | sudo tee -a /etc/pacman.d/mirrorlist
+	echo "Server = http://repo.flossir.org/repository/arch/\$repo/os/\$arch" | sudo tee -a /etc/pacman.d/mirrorlist
 }
 
 build() {

From 10579893f97a1f816d2b893f08bed1f470deecfe Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Thu, 5 Sep 2024 17:14:19 +0330
Subject: [PATCH 12/34] trying again

---
 build.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build.sh b/build.sh
index 9ecadcb..c94473d 100755
--- a/build.sh
+++ b/build.sh
@@ -33,7 +33,6 @@ main() {
             install
             echo -e "$Blue### Install complete ###$reset"
             echo -e "$Green### Start build $reponame with archiso ###$reset"
-            change_mirror
 	    build
         fi
     else
@@ -48,10 +47,6 @@ install() {
     pacman -Sy; pacman --noconfirm -S --needed git archiso github-cli p7zip reflector rsync
 }
 
-change_mirror() {
-	rm -rf /etc/pacman.d/mirrorlist
-	echo "Server = http://repo.flossir.org/repository/arch/\$repo/os/\$arch" | sudo tee -a /etc/pacman.d/mirrorlist
-}
 
 build() {
     set -e

From 3dde3268256aaa1abbbc8c3cc3023da3df96d41c Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Thu, 5 Sep 2024 17:21:47 +0330
Subject: [PATCH 13/34] testing

---
 .gitlab-ci.yml | 2 +-
 test.sh        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100755 test.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2a19a1..e191a89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ image: archlinux/archlinux:base-devel
 archiso:
   stage: build
   script:
-    - ./build.sh
+    - ./test.sh
   rules:
   when: manual
   artifacts:
diff --git a/test.sh b/test.sh
new file mode 100755
index 0000000..69794ad
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+pacman -Syy
+pacman -S neofetch --noconfirm
+neofetch
+pacman -S curl --noconfirm
+curl -v https://geo.mirror.pkgbuild.com/

From 8559f51d7fa40b6d7e7d40ba23e5749d0bd7592c Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Thu, 5 Sep 2024 17:28:34 +0330
Subject: [PATCH 14/34] speedtest

---
 test.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 69794ad..a0d8faa 100755
--- a/test.sh
+++ b/test.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 pacman -Syy
-pacman -S neofetch --noconfirm
+pacman -S neofetch speedtest-cli --noconfirm
 neofetch
 pacman -S curl --noconfirm
 curl -v https://geo.mirror.pkgbuild.com/
+speedtest

From 0f244bceb9b9fc12db0d217134a892b523d31cda Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Thu, 5 Sep 2024 17:44:38 +0330
Subject: [PATCH 15/34] fixed build

---
 .gitlab-ci.yml | 2 +-
 test.sh        | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100755 test.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e191a89..a2a19a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ image: archlinux/archlinux:base-devel
 archiso:
   stage: build
   script:
-    - ./test.sh
+    - ./build.sh
   rules:
   when: manual
   artifacts:
diff --git a/test.sh b/test.sh
deleted file mode 100755
index a0d8faa..0000000
--- a/test.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-pacman -Syy
-pacman -S neofetch speedtest-cli --noconfirm
-neofetch
-pacman -S curl --noconfirm
-curl -v https://geo.mirror.pkgbuild.com/
-speedtest

From 07b0d660925e3fddb13966ec60ff172c8c136944 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Fri, 13 Sep 2024 03:01:21 +0330
Subject: [PATCH 16/34] fixed cosmic

---
 .gitlab-ci.yml  | 24 +++++++++++++++++++-----
 iso/pacman.conf |  4 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2a19a1..0c9443b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,31 @@
 stages:
   - build
+  - release
 
 image: archlinux/archlinux:base-devel
 
+# Build stage to generate ISO
 archiso:
   stage: build
   script:
     - ./build.sh
   rules:
-  when: manual
-  artifacts:
-    paths:
-      - out/*.iso
-    expire_in: 1 week
+    - if: $CI_COMMIT_TAG  # Only run on new tag
 
+# Release stage to create a GitLab release and upload ISO
+release:
+  stage: release
+  script:
+    - echo "Creating GitLab release for tag $CI_COMMIT_TAG"
+    - |
+      curl --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" \
+        --data "name=Release $CI_COMMIT_TAG&tag_name=$CI_COMMIT_TAG&ref=$CI_COMMIT_SHA" \
+        --upload-file "out/*.iso" \
+        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases"
+  rules:
+    - if: $CI_COMMIT_TAG  # Only run on new tag
+  dependencies:
+    - archiso  # Get the built ISO from the previous job
+  only:
+    - tags  # Only trigger on tags
 
diff --git a/iso/pacman.conf b/iso/pacman.conf
index 2e5fe3e..f019daf 100644
--- a/iso/pacman.conf
+++ b/iso/pacman.conf
@@ -74,7 +74,7 @@ LocalFileSigLevel = Optional
 
 [ppr]
 SigLevel = Optional TrustedOnly
-Server = https://raw.githubusercontent.com/parchlinux/ppr/main/x86_64/
+Server = https://mirror.parchlinux.com/repos/$repo/$arch
 
 [core]
 Include = /etc/pacman.d/mirrorlist
@@ -96,7 +96,7 @@ Include = /etc/pacman.d/mirrorlist
 
 [pcp]
 SigLevel = Optional TrustedOnly
-Server = https://raw.githubusercontent.com/parchlinux/pcp/main/x86_64/
+Server = https://mirror.parchlinux.com/repos/$repo/$arch
 
 
 # An example of a custom package repository.  See the pacman manpage for

From 607eb83050637165c11861cc054b6065582f1966 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Fri, 13 Sep 2024 03:03:22 +0330
Subject: [PATCH 17/34] updated ci/cd

---
 .gitlab-ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c9443b..3e48186 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,15 +4,13 @@ stages:
 
 image: archlinux/archlinux:base-devel
 
-# Build stage to generate ISO
 archiso:
   stage: build
   script:
     - ./build.sh
   rules:
-    - if: $CI_COMMIT_TAG  # Only run on new tag
+    - if: $CI_COMMIT_TAG  
 
-# Release stage to create a GitLab release and upload ISO
 release:
   stage: release
   script:
@@ -23,9 +21,7 @@ release:
         --upload-file "out/*.iso" \
         "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases"
   rules:
-    - if: $CI_COMMIT_TAG  # Only run on new tag
+    - if: $CI_COMMIT_TAG  
   dependencies:
-    - archiso  # Get the built ISO from the previous job
-  only:
-    - tags  # Only trigger on tags
+    - archiso  
 

From 9adc5d14a91395781cd4f370ad203761145036d8 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Fri, 13 Sep 2024 11:55:52 +0330
Subject: [PATCH 18/34] changed repos to gitlab in build

---
 iso/pacman.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iso/pacman.conf b/iso/pacman.conf
index f019daf..fc117c3 100644
--- a/iso/pacman.conf
+++ b/iso/pacman.conf
@@ -74,7 +74,7 @@ LocalFileSigLevel = Optional
 
 [ppr]
 SigLevel = Optional TrustedOnly
-Server = https://mirror.parchlinux.com/repos/$repo/$arch
+Server = https://git.parchlinux.com/repo/ppr/-/raw/main/x86_64/
 
 [core]
 Include = /etc/pacman.d/mirrorlist
@@ -96,7 +96,7 @@ Include = /etc/pacman.d/mirrorlist
 
 [pcp]
 SigLevel = Optional TrustedOnly
-Server = https://mirror.parchlinux.com/repos/$repo/$arch
+Server = https://git.parchlinux.com/repo/pcp/-/raw/main/x86_64/
 
 
 # An example of a custom package repository.  See the pacman manpage for

From 673fa4c82898f38f1dfe2c7ca87897b0b8295975 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 11:53:40 +0330
Subject: [PATCH 19/34] updated build file with ssh and rsync

---
 .gitlab-ci.yml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e48186..f13db04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,32 @@
 stages:
   - build
-  - release
+  - deploy
 
 image: archlinux/archlinux:base-devel
 
+variables:
+  Desktop: "Cosmic"  # Change this value to your desired desktop environment
+
 archiso:
   stage: build
   script:
     - ./build.sh
+    - echo "Renaming the output ISO file"
+    - mv out/*.iso out/ParchLinux-$Desktop-latest.iso
   rules:
     - if: $CI_COMMIT_TAG  
 
-release:
-  stage: release
+deploy:
+  stage: deploy
   script:
-    - echo "Creating GitLab release for tag $CI_COMMIT_TAG"
-    - |
-      curl --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" \
-        --data "name=Release $CI_COMMIT_TAG&tag_name=$CI_COMMIT_TAG&ref=$CI_COMMIT_SHA" \
-        --upload-file "out/*.iso" \
-        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases"
+    - echo "Installing sshpass"
+    - pacman -Syu --noconfirm sshpass
+    - 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" rsync -avz -e "ssh -o StrictHostKeyChecking=no" out/ParchLinux-$Desktop-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
   rules:
     - if: $CI_COMMIT_TAG  
   dependencies:
-    - archiso  
+    - archiso
 

From cd81e1ada8cbbca38c70622e74554d9ef6688bfe Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 12:29:10 +0330
Subject: [PATCH 20/34] updated build file with ssh and rsync

---
 .gitlab-ci.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f13db04..53c0452 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,15 +4,12 @@ stages:
 
 image: archlinux/archlinux:base-devel
 
-variables:
-  Desktop: "Cosmic"  # Change this value to your desired desktop environment
-
 archiso:
   stage: build
   script:
     - ./build.sh
     - echo "Renaming the output ISO file"
-    - mv out/*.iso out/ParchLinux-$Desktop-latest.iso
+    - mv out/*.iso out/ParchLinux-cosmic-latest.iso
   rules:
     - if: $CI_COMMIT_TAG  
 
@@ -24,7 +21,7 @@ deploy:
     - 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" rsync -avz -e "ssh -o StrictHostKeyChecking=no" out/ParchLinux-$Desktop-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
+    - sshpass -p "$PASS" rsync -avz -e "ssh -o StrictHostKeyChecking=no" out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
   rules:
     - if: $CI_COMMIT_TAG  
   dependencies:

From 7ad4f6b811091909137f416d69dfe7dfa57ee0b1 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 13:00:53 +0330
Subject: [PATCH 21/34] updated build file with ssh and rsync

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53c0452..107c457 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ deploy:
   stage: deploy
   script:
     - echo "Installing sshpass"
-    - pacman -Syu --noconfirm sshpass
+    - 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"

From 543e939e0292374351d42584f0c64bf22d7ce9f2 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 13:32:45 +0330
Subject: [PATCH 22/34] updated build file with ssh and rsync

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 107c457..7f8dfb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ deploy:
     - 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" rsync -avz -e "ssh -o StrictHostKeyChecking=no" out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
+    - sshpass -p "$PASS" scp -o StrictHostKeyChecking=no out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic
   rules:
     - if: $CI_COMMIT_TAG  
   dependencies:

From 7ff8cb4f5cf6e8a6f75d153afe7917df863ab06d Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 14:00:04 +0330
Subject: [PATCH 23/34] updated build file with ssh and rsync

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f8dfb0..ace9737 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ deploy:
     - 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/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic
+    - sshpass -p "$PASS" scp -o StrictHostKeyChecking=no out/*.iso parch@$SSH_ROOT:/srv/http/cosmic
   rules:
     - if: $CI_COMMIT_TAG  
   dependencies:

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 24/34] 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:

From 36fac961c11d94dee71c01b0fc26dedc9e656410 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 15:26:03 +0330
Subject: [PATCH 25/34] I AM SOHRAB

---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa39c06..bfd71bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,10 +13,6 @@ archiso:
     - ./build.sh
     - echo "Renaming the output ISO file"
     - mv out/*.iso out/Parchlinux-$Desktop-latest.iso
-  rules:
-    - if: $CI_COMMIT_TAG  
-
-deploy:
   stage: deploy
   script:
     - echo "Installing sshpass and rsync"
@@ -29,6 +25,5 @@ deploy:
     - sshpass -p "$PASS" rsync -r "$(ls out/*.iso)" parch@SSH_ROOT:/srv/http/cosmic/
   rules:
     - if: $CI_COMMIT_TAG  
-  dependencies:
-    - archiso
+
 

From 341feaab433668b6607ea2560a2381a21fc8341b Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 15:29:59 +0330
Subject: [PATCH 26/34] F... Gitlab

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfd71bc..01d4450 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,20 @@ image: archlinux/archlinux:base-devel
 variables:
   Desktop: "cosmic"
 
-archiso:
+build_iso:
   stage: build
   script:
     - ./build.sh
     - echo "Renaming the output ISO file"
-    - mv out/*.iso out/Parchlinux-$Desktop-latest.iso
+    - mv out/*.iso out/ParchLinux-cosmic-latest.iso
+  artifacts:
+    paths:
+      - out/ParchLinux-cosmic-latest.iso
+
+deploy_iso:
   stage: deploy
+  dependencies:
+    - build_iso
   script:
     - echo "Installing sshpass and rsync"
     - pacman -Syu --noconfirm sshpass rsync
@@ -22,8 +29,6 @@ archiso:
     - 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/
+    - sshpass -p "$PASS" rsync -r out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
   rules:
-    - if: $CI_COMMIT_TAG  
-
-
+    - if: $CI_COMMIT_TAG

From a131e380fadb6fdbf484cef07d3336b39cb09368 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 16 Sep 2024 16:14:01 +0330
Subject: [PATCH 27/34] added rules for build

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01d4450..5ba1bfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ build_iso:
   artifacts:
     paths:
       - out/ParchLinux-cosmic-latest.iso
+  rules:
+    - if: $CI_COMMIT_TAG
 
 deploy_iso:
   stage: deploy

From 76f5aa6b6d7e698c4864253fca1192e0a4adfd4f Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Sat, 23 Nov 2024 14:11:43 +0330
Subject: [PATCH 28/34] Added Hash Generation

---
 .gitlab-ci.yml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ba1bfa..2d25c61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,10 +12,17 @@ build_iso:
   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
+    - echo "Generating MD5 checksum"
+    - md5sum out/ParchLinux-$Desktop-latest.iso > out/md5sum.txt
+    - BUILD_DATE=$(date +"%Y-%m-%d")
+    - echo "Build Date: $BUILD_DATE" >> out/md5sum.txt
+    - echo "Build completed. Files generated:"
+    - ls -lh out/
   artifacts:
     paths:
-      - out/ParchLinux-cosmic-latest.iso
+      - out/ParchLinux-$Desktop-latest.iso
+      - out/md5sum.txt
   rules:
     - if: $CI_COMMIT_TAG
 
@@ -26,11 +33,17 @@ deploy_iso:
   script:
     - echo "Installing sshpass and rsync"
     - pacman -Syu --noconfirm sshpass rsync
+
+    - echo "Determining the remote directory based on the tag"
+    - if [[ "$CI_COMMIT_TAG" == *"beta"* ]]; then export REMOTE_DIR="/srv/http/beta/$Desktop/"; else export REMOTE_DIR="/srv/http/$Desktop"; fi
+
     - echo "Removing old ISO files from remote directory"
-    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf /srv/http/cosmic/
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf $REMOTE_DIR/
+
     - echo "Creating new directory on remote host"
-    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p /srv/http/cosmic/
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p $REMOTE_DIR/
+
     - echo "Uploading new ISO via rsync"
-    - sshpass -p "$PASS" rsync -r out/ParchLinux-cosmic-latest.iso parch@$SSH_ROOT:/srv/http/cosmic/
+    - sshpass -p "$PASS" rsync -r out/ParchLinux-$Desktop-latest.iso out/md5sum.txt parch@$SSH_ROOT:$REMOTE_DIR/
   rules:
     - if: $CI_COMMIT_TAG

From a776ad4a95bf157c624aa42ade953a6dcbec901d Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Sat, 23 Nov 2024 14:15:33 +0330
Subject: [PATCH 29/34] Added Hash Generation

---
 .gitlab-ci.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d25c61..83a7029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,7 @@ build_iso:
     - mv out/*.iso out/ParchLinux-$Desktop-latest.iso
     - echo "Generating MD5 checksum"
     - md5sum out/ParchLinux-$Desktop-latest.iso > out/md5sum.txt
-    - BUILD_DATE=$(date +"%Y-%m-%d")
-    - echo "Build Date: $BUILD_DATE" >> out/md5sum.txt
+    - bash -c 'echo "Build Date: $(date +"%Y-%m-%d")" >> out/md5sum.txt'
     - echo "Build completed. Files generated:"
     - ls -lh out/
   artifacts:
@@ -33,17 +32,13 @@ deploy_iso:
   script:
     - echo "Installing sshpass and rsync"
     - pacman -Syu --noconfirm sshpass rsync
-
     - echo "Determining the remote directory based on the tag"
-    - if [[ "$CI_COMMIT_TAG" == *"beta"* ]]; then export REMOTE_DIR="/srv/http/beta/$Desktop/"; else export REMOTE_DIR="/srv/http/$Desktop"; fi
-
+    - bash -c '[[ "$CI_COMMIT_TAG" == *"beta"* ]] && export REMOTE_DIR="/srv/http/beta/$Desktop/" || export REMOTE_DIR="/srv/http/$Desktop"'
     - echo "Removing old ISO files from remote directory"
-    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf $REMOTE_DIR/
-
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf "$REMOTE_DIR/"
     - echo "Creating new directory on remote host"
-    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p $REMOTE_DIR/
-
+    - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT mkdir -p "$REMOTE_DIR/"
     - echo "Uploading new ISO via rsync"
-    - sshpass -p "$PASS" rsync -r out/ParchLinux-$Desktop-latest.iso out/md5sum.txt parch@$SSH_ROOT:$REMOTE_DIR/
+    - sshpass -p "$PASS" rsync -r out/ParchLinux-$Desktop-latest.iso out/md5sum.txt parch@$SSH_ROOT:"$REMOTE_DIR/"
   rules:
     - if: $CI_COMMIT_TAG

From 4237588d3a6a6813e9d131ab4c17a5840b78243a Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Sat, 23 Nov 2024 14:22:20 +0330
Subject: [PATCH 30/34] Added Hash Generation

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83a7029..5252f66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 image: archlinux/archlinux:base-devel
 
 variables:
-  Desktop: "cosmic"
+  Desktop: "plasma"
 
 build_iso:
   stage: build
@@ -15,7 +15,6 @@ build_iso:
     - mv out/*.iso out/ParchLinux-$Desktop-latest.iso
     - echo "Generating MD5 checksum"
     - md5sum out/ParchLinux-$Desktop-latest.iso > out/md5sum.txt
-    - bash -c 'echo "Build Date: $(date +"%Y-%m-%d")" >> out/md5sum.txt'
     - echo "Build completed. Files generated:"
     - ls -lh out/
   artifacts:
@@ -33,7 +32,7 @@ deploy_iso:
     - echo "Installing sshpass and rsync"
     - pacman -Syu --noconfirm sshpass rsync
     - echo "Determining the remote directory based on the tag"
-    - bash -c '[[ "$CI_COMMIT_TAG" == *"beta"* ]] && export REMOTE_DIR="/srv/http/beta/$Desktop/" || export REMOTE_DIR="/srv/http/$Desktop"'
+    - if [[ "$CI_COMMIT_TAG" == *"beta"* ]]; then export REMOTE_DIR="/srv/http/beta/$Desktop/"; else export REMOTE_DIR="/srv/http/$Desktop/"; fi
     - echo "Removing old ISO files from remote directory"
     - sshpass -p "$PASS" ssh -o StrictHostKeyChecking=no parch@$SSH_ROOT rm -rf "$REMOTE_DIR/"
     - echo "Creating new directory on remote host"

From 085f89a5d81d19c42d0eeff47d47d20be32294a5 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Sat, 25 Jan 2025 23:22:04 +0330
Subject: [PATCH 31/34] ready to build with systemd-boot

---
 build.sh            | 4 +++-
 iso/packages.x86_64 | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index c94473d..ae91d1f 100755
--- a/build.sh
+++ b/build.sh
@@ -44,7 +44,9 @@ main() {
 
 install() {
     set -e
-    pacman -Sy; pacman --noconfirm -S --needed git archiso github-cli p7zip reflector rsync
+    pacman -Sy; pacman --noconfirm -S --needed git wget github-cli p7zip reflector rsync
+    wget https://git.parchlinux.com/repo/ppr/-/raw/main/x86_64/archiso-99-1-any.pkg.tar.zst
+    sudo pacman -U archiso-99-1-any.pkg.tar.zst --noconfirm
 }
 
 
diff --git a/iso/packages.x86_64 b/iso/packages.x86_64
index c86c611..9f76627 100644
--- a/iso/packages.x86_64
+++ b/iso/packages.x86_64
@@ -31,7 +31,6 @@ f2fs-tools
 fatresize
 fsarchiver
 git
-gnu-netcat
 gpart
 gpm
 gptfdisk
@@ -160,4 +159,4 @@ paru
 parch-emoji-ios
 ttf-vazirmatn
 parch-branding
-parch-pacman
+parch-pacman-systemd

From bc01c3c60d5600b691efb384c29d87514fb84288 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Sun, 26 Jan 2025 01:55:48 +0330
Subject: [PATCH 32/34] Fixed Cosmic Ci/Cd

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5252f66..142e8c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 image: archlinux/archlinux:base-devel
 
 variables:
-  Desktop: "plasma"
+  Desktop: "cosmic"
 
 build_iso:
   stage: build

From 23b49dc379dbaf3927f0cbce74e69635053f071a Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 10 Feb 2025 17:52:21 +0330
Subject: [PATCH 33/34] Fixed Issue for kernel

---
 iso/packages.x86_64 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iso/packages.x86_64 b/iso/packages.x86_64
index 9f76627..61168b5 100644
--- a/iso/packages.x86_64
+++ b/iso/packages.x86_64
@@ -149,6 +149,7 @@ btop
 xdg-user-dirs
 neofetch-git
 fastfetch
+kernel-install-mkinitcpio
 
 #ParchLinux Core Packages
 parch-welcome

From ca0d2d0a3083b46d7417de3aff11cc6e5f4827d9 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Mon, 10 Feb 2025 18:43:00 +0330
Subject: [PATCH 34/34] Removed reiserfsprogs

---
 iso/packages.x86_64 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/iso/packages.x86_64 b/iso/packages.x86_64
index 61168b5..65ce6dd 100644
--- a/iso/packages.x86_64
+++ b/iso/packages.x86_64
@@ -92,7 +92,6 @@ python
 python-psutil
 python-systemd
 refind
-reiserfsprogs
 rp-pppoe
 rsync
 rxvt-unicode-terminfo