From f9ccc7d43138695361f2eb8376212bc524397604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Sun, 16 Aug 2026 02:13:02 -0400
Subject: [PATCH 1/9] Adding Arch Linux packaging

---
 .github/workflows/package.yml  |  21 ++++
 build/resources/aur/PKGBUILD   |  47 ++++++++
 build/scripts/package.linux.sh | 198 ++++++++++++++++++++-------------
 3 files changed, 186 insertions(+), 80 deletions(-)
 create mode 100644 build/resources/aur/PKGBUILD

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 0845774fb3..133302a2e9 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -83,6 +83,25 @@ jobs:
           ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
           apt-get update
           apt-get install -y curl wget git dpkg-dev fakeroot tzdata zip unzip desktop-file-utils rpm libfuse2 file build-essential binutils
+
+          # Detect Ubuntu Codename
+          UBUNTU_CODENAME=$(lsb_release -cs)
+
+          # If it's not a supported Ubuntu release, the build script
+          # should report failure to create Arch package while not
+          # affecting other packages.
+
+          if [ "$UBUNTU_CODENAME" = "noble" ]; then
+            echo "Detected Ubuntu 24.04 (Noble). Installing official package..."
+            sudo apt-get install -y pacman-package-manager
+          elif [ "$UBUNTU_CODENAME" = "focal" ]; then
+            echo "Detected Ubuntu 20.04 (Focal). Installing community port..."
+            # Use the version compiled for glibc 2.31 (Ubuntu 20.04 standard)
+            wget https://github.com/ThePoorPilot/pacman-utils/releases/download/6.0.1-2_2.31-0/pacman-utils_6.0.1-2_amd64.deb
+            sudo dpkg -i pacman-utils_6.0.1-2_amd64.deb
+            sudo apt-get install -f -y
+          fi
+
       - name: Download build
         uses: actions/download-artifact@v8
         with:
@@ -105,6 +124,8 @@ jobs:
             build/sourcegit-*.AppImage
             build/sourcegit_*.deb
             build/sourcegit-*.rpm
+            build/sourcegit-*.pkg.tar.zst
+            build/sourcegit-*.pkg.tar.xz
       - name: Delete temp artifacts
         uses: geekyeggo/delete-artifact@v6
         with:
diff --git a/build/resources/aur/PKGBUILD b/build/resources/aur/PKGBUILD
new file mode 100644
index 0000000000..a5e6908601
--- /dev/null
+++ b/build/resources/aur/PKGBUILD
@@ -0,0 +1,47 @@
+# Modified for for sourcegit repo relase builds.
+# Special thanks to the AUR package maintainer: Aikawa Yataro <aikawayataro at protonmail dot com>
+
+pkgname=sourcegit-bin
+_name="${pkgname%-bin}"
+pkgver=$VERSION
+pkgrel=1
+pkgdesc="GUI client for GIT users"
+arch=('x86_64')
+url='https://github.com/sourcegit-scm/sourcegit'
+license=('MIT')
+provides=('sourcegit')
+conflicts=('sourcegit')
+depends=('git' 'xdg-utils')
+optdepends=('git-credential-manager: third-party authentication support')
+makedepends=('desktop-file-utils')
+options=('!debug')
+
+prepare() {
+    local _desktop_file="${startdir}/usr/share/applications/${_name}.desktop"
+
+# desktop-file-install
+
+    if [[ -f "$_desktop_file" ]]; then
+        desktop-file-edit "$_desktop_file" \
+            --set-icon="${_name}" \
+            --set-key=Exec \
+            --set-value="${_name}"
+    fi
+}
+
+package() {
+    install -d "$pkgdir/opt/$_name/"
+    install -d "$pkgdir/usr/bin/"
+
+    cp -ra "${startdir}/opt/"* "${pkgdir}/opt/"
+    cp -ra "${startdir}/usr/"* "${pkgdir}/usr/"
+
+    install -Dm644 "${startdir}/usr/share/applications/${_name}.desktop" \
+                   "${pkgdir}/usr/share/applications/${_name}.desktop"
+
+    install -Dm644 "${startdir}/usr/share/icons/${_name}.png" \
+                   "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_name}.png"
+
+    install -Dm644 "${startdir}/LICENSE" \
+                    "${pkgdir}/usr/share/licenses/${_realname}/LICENSE"
+}
diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index 262f141ae8..37f0c1811d 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -1,86 +1,124 @@
 #!/usr/bin/env bash
 
-set -e
-set -o
-set -u
-set pipefail
-
-# ICU versions to support (Debian has no virtual package, must list all)
-# Format: space-separated version numbers
-ICU_VERSIONS="78 77 76 74 72 71 70 69 68 67 66 65 63"
+set -euo pipefail
 
 arch=
 appimage_arch=
 target=
-case "$RUNTIME" in
-    linux-x64)
-        arch=amd64
-        appimage_arch=x86_64
-        target=x86_64;;
-    linux-arm64)
-        arch=arm64
-        appimage_arch=arm_aarch64
-        target=aarch64;;
-    *)
-        echo "Unknown runtime $RUNTIME"
-        exit 1;;
-esac
-
-APPIMAGETOOL_URL=https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
-
-cd build
-
-if [[ ! -f "appimagetool" ]]; then
-    curl -o appimagetool -L "$APPIMAGETOOL_URL"
-    chmod +x appimagetool
-fi
-
-rm -f SourceGit/*.dbg
-rm -f SourceGit/*.pdb
-
-mkdir -p SourceGit.AppDir/opt
-mkdir -p SourceGit.AppDir/usr/share/metainfo
-mkdir -p SourceGit.AppDir/usr/share/applications
-
-cp -r SourceGit SourceGit.AppDir/opt/sourcegit
-desktop-file-install resources/_common/applications/sourcegit.desktop --dir SourceGit.AppDir/usr/share/applications \
-    --set-icon com.sourcegit_scm.SourceGit --set-key=Exec --set-value=AppRun
-mv SourceGit.AppDir/usr/share/applications/{sourcegit,com.sourcegit_scm.SourceGit}.desktop
-cp resources/_common/icons/sourcegit.png SourceGit.AppDir/com.sourcegit_scm.SourceGit.png
-ln -rsf SourceGit.AppDir/opt/sourcegit/sourcegit SourceGit.AppDir/AppRun
-ln -rsf SourceGit.AppDir/usr/share/applications/com.sourcegit_scm.SourceGit.desktop SourceGit.AppDir
-cp resources/appimage/sourcegit.appdata.xml SourceGit.AppDir/usr/share/metainfo/com.sourcegit_scm.SourceGit.appdata.xml
-
-ARCH="$appimage_arch" ./appimagetool -v SourceGit.AppDir "sourcegit-$VERSION.linux.$arch.AppImage"
-
-mkdir -p resources/deb/opt/sourcegit/
-mkdir -p resources/deb/usr/bin
-mkdir -p resources/deb/usr/share/applications
-mkdir -p resources/deb/usr/share/icons
-cp -f SourceGit/* resources/deb/opt/sourcegit
-ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
-cp -r resources/_common/applications resources/deb/usr/share
-cp -r resources/_common/icons resources/deb/usr/share
-
-# Calculate installed size in KB
-installed_size=$(du -sk resources/deb | cut -f1)
-
-# Generate ICU dependencies string for Debian
-# Debian lacks libicu virtual package, must list all versions with OR operator
-icu_deps="libicu"
-for v in $ICU_VERSIONS; do
-    icu_deps="$icu_deps | libicu$v"
-done
-
-# Update the control file (replace placeholder, not whole Depends line)
-sed -i -e "s/^Version:.*/Version: $VERSION/" \
-    -e "s/^Architecture:.*/Architecture: $arch/" \
-    -e "s/^Installed-Size:.*/Installed-Size: $installed_size/" \
-    -e "s/@ICU_DEPS@/$icu_deps/" \
-    resources/deb/DEBIAN/control
-
-# Build deb package with gzip compression
-dpkg-deb -Zgzip --root-owner-group --build resources/deb "sourcegit_$VERSION-1_$arch.deb"
-
-rpmbuild -bb --target="$target" resources/rpm/SPECS/build.spec --define "_topdir $(pwd)/resources/rpm" --define "_version $VERSION"
-mv "resources/rpm/RPMS/$target/sourcegit-$VERSION-1.$target.rpm" ./
+
+main() {
+    case "$RUNTIME" in
+        linux-x64)
+            arch=amd64
+            appimage_arch=x86_64
+            target=x86_64;;
+        linux-arm64)
+            arch=arm64
+            appimage_arch=arm_aarch64
+            target=aarch64;;
+        *)
+            echo "Unknown runtime $RUNTIME"
+            exit 1;;
+    esac
+
+    cd build
+    build_appimage
+    build_debian_package
+    build_rpm_package
+    build_arch_package
+}
+
+build_appimage() {
+    APPIMAGETOOL_URL=https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+
+
+    if [[ ! -f "appimagetool" ]]; then
+        curl -o appimagetool -L "$APPIMAGETOOL_URL"
+        chmod +x appimagetool
+    fi
+
+    rm -f SourceGit/*.dbg
+    rm -f SourceGit/*.pdb
+
+    mkdir -p SourceGit.AppDir/opt
+    mkdir -p SourceGit.AppDir/usr/share/metainfo
+    mkdir -p SourceGit.AppDir/usr/share/applications
+
+    cp -r SourceGit SourceGit.AppDir/opt/sourcegit
+    desktop-file-install resources/_common/applications/sourcegit.desktop --dir SourceGit.AppDir/usr/share/applications \
+        --set-icon com.sourcegit_scm.SourceGit --set-key=Exec --set-value=AppRun
+    mv SourceGit.AppDir/usr/share/applications/{sourcegit,com.sourcegit_scm.SourceGit}.desktop
+    cp resources/_common/icons/sourcegit.png SourceGit.AppDir/com.sourcegit_scm.SourceGit.png
+    ln -rsf SourceGit.AppDir/opt/sourcegit/sourcegit SourceGit.AppDir/AppRun
+    ln -rsf SourceGit.AppDir/usr/share/applications/com.sourcegit_scm.SourceGit.desktop SourceGit.AppDir
+    cp resources/appimage/sourcegit.appdata.xml SourceGit.AppDir/usr/share/metainfo/com.sourcegit_scm.SourceGit.appdata.xml
+
+    ARCH="$appimage_arch" ./appimagetool -v SourceGit.AppDir "sourcegit-$VERSION.linux.$arch.AppImage"
+}
+
+build_debian_package() {
+    # ICU versions to support (Debian has no virtual package, must list all)
+    # Format: space-separated version numbers
+    ICU_VERSIONS="78 77 76 74 72 71 70 69 68 67 66 65 63"
+
+    mkdir -p resources/deb/opt/sourcegit/
+    mkdir -p resources/deb/usr/bin
+    mkdir -p resources/deb/usr/share/applications
+    mkdir -p resources/deb/usr/share/icons
+    cp -f SourceGit/* resources/deb/opt/sourcegit
+    ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
+    cp -r resources/_common/applications resources/deb/usr/share
+    cp -r resources/_common/icons resources/deb/usr/share
+
+    # Calculate installed size in KB
+    installed_size=$(du -sk resources/deb | cut -f1)
+
+    # Generate ICU dependencies string for Debian
+    # Debian lacks libicu virtual package, must list all versions with OR operator
+    icu_deps="libicu"
+    for v in $ICU_VERSIONS; do
+        icu_deps="$icu_deps | libicu$v"
+    done
+
+    # Update the control file (replace placeholder, not whole Depends line)
+    sed -i -e "s/^Version:.*/Version: $VERSION/" \
+        -e "s/^Architecture:.*/Architecture: $arch/" \
+        -e "s/^Installed-Size:.*/Installed-Size: $installed_size/" \
+        -e "s/@ICU_DEPS@/$icu_deps/" \
+        resources/deb/DEBIAN/control
+
+    # Build deb package with gzip compression
+    dpkg-deb -Zgzip --root-owner-group --build resources/deb "sourcegit_$VERSION-1_$arch.deb"
+}
+
+build_rpm_package() {
+    rpmbuild -bb --target="$target" resources/rpm/SPECS/build.spec --define "_topdir $(pwd)/resources/rpm" --define "_version $VERSION"
+
+    mv "resources/rpm/RPMS/$target/sourcegit-$VERSION-1.$target.rpm" ./
+}
+
+build_arch_package() {
+    if command -v makepkg &> /dev/null; then
+        mkdir -p resources/aur/opt/sourcegit/
+        mkdir -p resources/aur/usr/bin
+        mkdir -p resources/aur/usr/share/applications
+        mkdir -p resources/aur/usr/share/icons
+        cp ../LICENSE resources/aur/
+        cp -f SourceGit/* resources/aur/opt/sourcegit
+        ln -rsf resources/aur/opt/sourcegit/sourcegit resources/aur/usr/bin
+        cp -r resources/_common/applications resources/aur/usr/share
+        cp -r resources/_common/icons resources/aur/usr/share
+
+        cd "resources/aur/" && makepkg
+
+        cd ../../ # return to previous path
+
+        if [[ -f "resources/aur/sourcegit-bin-${VERSION}-1-$(uname -m).pkg.tar.zst" ]]; then
+            mv resources/aur/sourcegit-bin*.pkg.tar.zst .
+        fi
+    else
+        echo -e "\033[0;31 ⚠ makepkg not found!\033\[0m"
+    fi
+}
+
+main "$@"

From 277220b9c6f1e43796e35e45fb877653cd258a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Sun, 23 Aug 2026 10:02:24 -0400
Subject: [PATCH 2/9] Updates to packaging script and GH workflow

Still a WIP locally using `nektos/act`, pushing these changes in the meantime.
---
 .github/workflows/package.yml  | 74 ++++++++++++++++++++++++++++------
 build/scripts/package.linux.sh |  4 +-
 2 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 133302a2e9..6f6b6c2bef 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -82,27 +82,75 @@ jobs:
           export DEBIAN_FRONTEND=noninteractive
           ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
           apt-get update
-          apt-get install -y curl wget git dpkg-dev fakeroot tzdata zip unzip desktop-file-utils rpm libfuse2 file build-essential binutils
+          apt-get install -y curl wget git dpkg-dev fakeroot tzdata \
+                             zip unzip desktop-file-utils rpm libfuse2 \
+                             file build-essential binutils
 
           # Detect Ubuntu Codename
-          UBUNTU_CODENAME=$(lsb_release -cs)
-
-          # If it's not a supported Ubuntu release, the build script
-          # should report failure to create Arch package while not
-          # affecting other packages.
+          UBUNTU_CODENAME=$(. /etc/os-release && echo "$VERSION_CODENAME")
 
           if [ "$UBUNTU_CODENAME" = "noble" ]; then
             echo "Detected Ubuntu 24.04 (Noble). Installing official package..."
-            sudo apt-get install -y pacman-package-manager
+            apt-get install -y pacman-package-manager
           elif [ "$UBUNTU_CODENAME" = "focal" ]; then
-            echo "Detected Ubuntu 20.04 (Focal). Installing community port..."
-            # Use the version compiled for glibc 2.31 (Ubuntu 20.04 standard)
-            wget https://github.com/ThePoorPilot/pacman-utils/releases/download/6.0.1-2_2.31-0/pacman-utils_6.0.1-2_amd64.deb
-            sudo dpkg -i pacman-utils_6.0.1-2_amd64.deb
-            sudo apt-get install -f -y
-          fi
+            echo "Detected Ubuntu 20.04 (Focal). Building Arch Linux packaging tools..."
+            #
+            # Install pacman, makepkg, and Arch packaging utilities on Ubuntu Linux
+            #
+            # Written 2024-06-27 by Ronald Joe Record <ronaldrecord@gmail.com>
+
+            apt-get install -y pkg-config meson gcc libtool libgpgme-dev \
+                            libarchive-dev ninja-build libcurl4-openssl-dev \
+                            libssl-dev curl gettext python3 python3-setuptools \
+                            dash gawk ca-certificates fakechroot \
+                            libarchive-tools
+
+            # Need a more recent version of Meson
+            mkdir -p /usr/local/meson
+            git clone https://github.com/mesonbuild/meson.git /usr/local/meson
+            CWD=$(pwd)
+            cd /usr/local/meson
+            git fetch --tags
+            git checkout 1.4.2
+            cd $CWD
+
+            [ -f /usr/bin/meson ] && {
+                mver=$(/usr/bin/meson --version)
+                mv /usr/bin/meson /usr/bin/meson-${mver}
+            }
+
+            if [ -f /usr/local/meson/meson.py ]; then
+                ln -s /usr/local/meson/meson.py /usr/bin/meson
+            else
+                echo "ERROR: cannot locate /usr/local/meson/meson.py"
+                exit 1
+            fi
 
+            rm -rf pacman
+            git clone https://gitlab.archlinux.org/pacman/pacman.git
+            CWD=$(pwd)
+            cd pacman
+            meson setup -Ddoc=disabled build
+            ninja -C build
+
+            [ -d build ] || {
+                echo "Directory pacman/build does not exist. Exiting."
+                exit 1
+            }
+            cd build
+
+            grep mirror scripts/libmakepkg/source/git.sh > /dev/null && {
+                cat scripts/libmakepkg/source/git.sh | sed -e "s/---mirror//" > /tmp/git$$
+                cp /tmp/git$$ scripts/libmakepkg/source/git.sh
+                rm -f /tmp/git$$
+            }
+
+            meson install --no-rebuild --quiet
+
+            cd $CWD
+          fi
       - name: Download build
+        if : env.ACT == ''
         uses: actions/download-artifact@v8
         with:
           name: sourcegit.${{ matrix.runtime }}
diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index 37f0c1811d..d676257d10 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -109,7 +109,9 @@ build_arch_package() {
         cp -r resources/_common/applications resources/aur/usr/share
         cp -r resources/_common/icons resources/aur/usr/share
 
-        cd "resources/aur/" && makepkg
+        cd "resources/aur/" || exit 1
+
+        makepkg
 
         cd ../../ # return to previous path
 

From 0dc656c9978b02774469b3af00069450f388063c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Sun, 23 Aug 2026 13:44:25 -0400
Subject: [PATCH 3/9] Success!
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In theory™️ this should work with GH actions!
---
 build/scripts/package.linux.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index d676257d10..9e5810c1b8 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -22,13 +22,18 @@ main() {
     esac
 
     cd build
+    echo "======== Creating Linux Packaging For Version: $VERSION ========"
+
     build_appimage
     build_debian_package
     build_rpm_package
     build_arch_package
+
+    echo "======== Packag Creation Complete For Version: $VERSION ========"
 }
 
 build_appimage() {
+    echo "-------- Creating AppImage Package --------"
     APPIMAGETOOL_URL=https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
 
 
@@ -57,6 +62,7 @@ build_appimage() {
 }
 
 build_debian_package() {
+    echo "-------- Creating Debian/Ubuntu Package --------"
     # ICU versions to support (Debian has no virtual package, must list all)
     # Format: space-separated version numbers
     ICU_VERSIONS="78 77 76 74 72 71 70 69 68 67 66 65 63"
@@ -92,12 +98,14 @@ build_debian_package() {
 }
 
 build_rpm_package() {
+    echo "-------- Creating RPM Package --------"
     rpmbuild -bb --target="$target" resources/rpm/SPECS/build.spec --define "_topdir $(pwd)/resources/rpm" --define "_version $VERSION"
 
     mv "resources/rpm/RPMS/$target/sourcegit-$VERSION-1.$target.rpm" ./
 }
 
 build_arch_package() {
+    echo "-------- Creating ARCH Package --------"
     if command -v makepkg &> /dev/null; then
         mkdir -p resources/aur/opt/sourcegit/
         mkdir -p resources/aur/usr/bin
@@ -111,7 +119,7 @@ build_arch_package() {
 
         cd "resources/aur/" || exit 1
 
-        makepkg
+        makepkg --nodeps
 
         cd ../../ # return to previous path
 

From fa1fccaf9295ec48a080a71af9d89cfc7f7a3cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Sun, 23 Aug 2026 13:48:11 -0400
Subject: [PATCH 4/9] Fixed typo.

---
 build/scripts/package.linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index 9e5810c1b8..18a6b49a59 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -29,7 +29,7 @@ main() {
     build_rpm_package
     build_arch_package
 
-    echo "======== Packag Creation Complete For Version: $VERSION ========"
+    echo "======== Package Creation Complete For Version: $VERSION ========"
 }
 
 build_appimage() {

From c95c9ad757b37c8a6d930f75228b5800de0573df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Sun, 23 Aug 2026 14:08:08 -0400
Subject: [PATCH 5/9] Adding pkguser creation used to run `makepkg` for Arch
 Linux packaging.

After testing GH Actions in my own fork, I confirmed that it is indeed run as a
root user.
---
 .github/workflows/package.yml  | 6 ++++++
 build/scripts/package.linux.sh | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 6f6b6c2bef..1605268d87 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -155,6 +155,12 @@ jobs:
         with:
           name: sourcegit.${{ matrix.runtime }}
           path: build
+      - name: Create package user
+        run: |
+          apt-get install -y sudo
+          useradd -m pkguser
+          echo "pkguser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+          chown -R pkguser:pkguser build
       - name: Package
         env:
           VERSION: ${{ inputs.version }}
diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index 18a6b49a59..de64677117 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -116,10 +116,16 @@ build_arch_package() {
         ln -rsf resources/aur/opt/sourcegit/sourcegit resources/aur/usr/bin
         cp -r resources/_common/applications resources/aur/usr/share
         cp -r resources/_common/icons resources/aur/usr/share
+        chown -R pkguser:pkguser ./
+
 
         cd "resources/aur/" || exit 1
 
-        makepkg --nodeps
+        if [ "$(id -u)" -eq 0 ]; then
+            sudo -E -u pkguser makepkg --nodeps
+        else
+            makepkg --nodeps
+        fi
 
         cd ../../ # return to previous path
 

From a808db0c5ea7fe5876e62f274b136ab921ea3a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Sun, 23 Aug 2026 14:41:41 -0400
Subject: [PATCH 6/9] Tweaks to ensure Arch Linux package is copied to expected
 location.

---
 build/scripts/package.linux.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index de64677117..fb029685ea 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -116,8 +116,8 @@ build_arch_package() {
         ln -rsf resources/aur/opt/sourcegit/sourcegit resources/aur/usr/bin
         cp -r resources/_common/applications resources/aur/usr/share
         cp -r resources/_common/icons resources/aur/usr/share
-        chown -R pkguser:pkguser ./
 
+        chown -R pkguser:pkguser ./
 
         cd "resources/aur/" || exit 1
 
@@ -127,11 +127,15 @@ build_arch_package() {
             makepkg --nodeps
         fi
 
-        cd ../../ # return to previous path
-
-        if [[ -f "resources/aur/sourcegit-bin-${VERSION}-1-$(uname -m).pkg.tar.zst" ]]; then
-            mv resources/aur/sourcegit-bin*.pkg.tar.zst .
+        if find . -maxdepth 1 -type f \( -name "sourcegit*.pkg.tar.zst" -o -name "sourcegit*.pkg.tar.xz" \) -quit | grep -q .; then
+            echo "Copying Arch package for artifact upload"
+            cp sourcegit*.pkg.tar.zst ../../
+        else
+            echo "Arch package file not found."
+            echo "$(ls -alh .)"
         fi
+
+        cd ../../ # return to previous path
     else
         echo -e "\033[0;31 ⚠ makepkg not found!\033\[0m"
     fi

From c1c68816830bda3868a889eb9d1777e4b6c43337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Mon, 24 Aug 2026 00:17:13 -0400
Subject: [PATCH 7/9] Adding `zstd` for use with `makepkg`

---
 .github/workflows/package.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 1605268d87..7176945d33 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -84,7 +84,7 @@ jobs:
           apt-get update
           apt-get install -y curl wget git dpkg-dev fakeroot tzdata \
                              zip unzip desktop-file-utils rpm libfuse2 \
-                             file build-essential binutils
+                             file build-essential binutils zstd
 
           # Detect Ubuntu Codename
           UBUNTU_CODENAME=$(. /etc/os-release && echo "$VERSION_CODENAME")
@@ -149,6 +149,10 @@ jobs:
 
             cd $CWD
           fi
+
+          # Swap Arch package file extension
+          sed -i "s/^PKGEXT='.pkg.tar.gz'$/PKGEXT='.pkg.tar.zst'/" /etc/makepkg.conf
+
       - name: Download build
         if : env.ACT == ''
         uses: actions/download-artifact@v8

From 21bfe364c9ec7b4a91b04829bee4cf9eeb0d3d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Mon, 24 Aug 2026 00:30:22 -0400
Subject: [PATCH 8/9] Fixed package file generation check

---
 build/scripts/package.linux.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index fb029685ea..aad6fe05cc 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -127,7 +127,7 @@ build_arch_package() {
             makepkg --nodeps
         fi
 
-        if find . -maxdepth 1 -type f \( -name "sourcegit*.pkg.tar.zst" -o -name "sourcegit*.pkg.tar.xz" \) -quit | grep -q .; then
+        if find . -maxdepth 1 -type f -name "sourcegit*.pkg.tar.zst" -o -name "sourcegit*.pkg.tar.xz" -quit | grep -q .; then
             echo "Copying Arch package for artifact upload"
             cp sourcegit*.pkg.tar.zst ../../
         else

From d498d57c03d81917a6274900c21df2cfb409437c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daedalus=E2=84=82odes?=
 <449275+daedalus-codes@users.noreply.github.com>
Date: Mon, 24 Aug 2026 01:06:06 -0400
Subject: [PATCH 9/9] Removing ACT check

This is unnessesary (for now).  If it's desired to test run GH actions locally
with nektos/act, it will be re-added along with other changes/checks to run it
locally.
---
 .github/workflows/package.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 7176945d33..4939877d29 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -154,7 +154,6 @@ jobs:
           sed -i "s/^PKGEXT='.pkg.tar.gz'$/PKGEXT='.pkg.tar.zst'/" /etc/makepkg.conf
 
       - name: Download build
-        if : env.ACT == ''
         uses: actions/download-artifact@v8
         with:
           name: sourcegit.${{ matrix.runtime }}