pacstall · oklopfer · Aug 22, 2023 · Aug 22, 2023
diff --git a/packages/armcord-deb/armcord-deb.pacscript b/packages/armcord-deb/armcord-deb.pacscript
@@ -3,12 +3,11 @@ gives="armcord"
 depends=("libgtk-3-0" "libnotify4" "libnss3" "libxss1" "libxtst6" "xdg-utils" "libatspi2.0-0" "libuuid1" "libsecret-1-0")
 repology=("project: ${gives}")
 pkgver="3.2.3"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="caa678865f84e0810412e2a17f20d86352f2cf9fcd7a4adff2ec6826bd41f30f"
-  arch=("arm64")
 else
   hash="77c5eff5e717c6450022a092f3654a94b3677b9ea111262f62d483bcdbc6ba5d"
-  arch=("amd64")
 fi
 url="https://github.com/ArmCord/ArmCord/releases/download/v${pkgver}/ArmCord_${pkgver}_${CARCH}.deb"
 pkgdesc="Custom client designed to enhance your Discord experience while keeping everything lightweight"

diff --git a/packages/celeste-bin/celeste-bin.pacscript b/packages/celeste-bin/celeste-bin.pacscript
@@ -5,16 +5,13 @@ pkgdesc="GUI cloud file synchronization client"
 maintainer="Oren Klopfer <oren@taumoda.com>"
 pkgver="0.5.4-rhino1"
 replace=("${gives}" "${gives}-git")
-
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == arm64 ]]; then
-  url="https://github.com/rhino-linux/${gives}/releases/download/v${pkgver}/${gives}_v${pkgver}_${CARCH}.zip"
   hash="8b8f29804a1744fde930153c1880e364704a9d978dffaee565a5f4cdf441eda0"
-  arch=('arm64')
 else
-  url="https://github.com/rhino-linux/${gives}/releases/download/v${pkgver}/${gives}_v${pkgver}_${CARCH}.zip"
   hash="5a11d81f4120de81ca484e6983d917aac99ae490a6a81a4d1fd4f8e88526e45c"
-  arch=('amd64')
 fi
+url="https://github.com/rhino-linux/${gives}/releases/download/v${pkgver}/${gives}_v${pkgver}_${CARCH}.zip"
 
 build() {
   sudo mkdir -p "${pkgdir}/usr"

diff --git a/packages/docker-bin/docker-bin.pacscript b/packages/docker-bin/docker-bin.pacscript
@@ -6,16 +6,15 @@ pkgver="24.0.4"
 depends=("procps" "git" "iptables")
 pkgdesc="Docker Engine Static Binaries"
 maintainer="Oren Klopfer <oren@taumoda.com>"
-
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == arm64 ]]; then
-  url="https://download.docker.com/linux/static/stable/aarch64/${gives}-${pkgver}.tgz"
+  gnuarch="aarch64"
   hash="193a8e1f051adce6a30a4c8486ce9b39929b9633a0da8c96444c9239859f4354"
-  arch=('arm64')
 else
-  url="https://download.docker.com/linux/static/stable/x86_64/${gives}-${pkgver}.tgz"
+  gnuarch="x86_64"
   hash="0ab79ae5f19e2ef5bdc3c3009c8b770dea6189e0f1e0ef4935d78fd30519b11d"
-  arch=('amd64')
 fi
+url="https://download.docker.com/linux/static/stable/${gnuarch}/${gives}-${pkgver}.tgz"
 
 build() {
   sudo mkdir -p "${pkgdir}/usr/bin"

diff --git a/packages/github-cli-deb/github-cli-deb.pacscript b/packages/github-cli-deb/github-cli-deb.pacscript
@@ -3,12 +3,11 @@ gives="gh"
 breaks=("${gives}-bin" "${gives}-git")
 replace=("${gives}")
 pkgver="2.31.0"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == arm64 ]]; then
    hash="ac6d125bb9890fdcd272a4cda42f67a344c5f5459e7247fc23af8813f69f9821"
-   arch=('arm64')
  else
    hash="3d33982fbf55878c370aa2c0cb48b7738de3dc43b154763e82352fbd7fa17ada"
-   arch=('amd64')
  fi
 url="https://github.com/cli/cli/releases/download/v${pkgver}/${gives}_${pkgver}_linux_${CARCH}.deb"
 pkgdesc="GitHub's official command line tool"

diff --git a/packages/linux-headers-generic-deb/linux-headers-generic-deb.pacscript b/packages/linux-headers-generic-deb/linux-headers-generic-deb.pacscript
@@ -2,12 +2,11 @@ name="linux-headers-generic-deb"
 gives="linux-headers-6.5.0-060500rc7-generic"
 pkgver="6.5-rc7"
 buildver="6.5.0-060500rc7.202308201631"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="f677c6a66813fe14b1cb38c22a38761c28f78165d261dfdfbac0582223a1a543"
-  arch=('arm64')
 else
   hash="be4425c725604b9de17770e4e19917581e9f5e3801f46cc2a00428142702cf06"
-  arch=('amd64')
 fi
 url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${pkgver}/${CARCH}/${gives}_${buildver}_${CARCH}.deb"
 pkgdesc="Ubuntu Linux mainline kernel (Generic headers)"

diff --git a/packages/linux-headers-generic-stable-deb/linux-headers-generic-stable-deb.pacscript b/packages/linux-headers-generic-stable-deb/linux-headers-generic-stable-deb.pacscript
@@ -2,12 +2,11 @@ name="linux-headers-generic-stable-deb"
 gives="linux-headers-6.4.10-060410-generic"
 pkgver="6.4.10"
 buildver="6.4.10-060410.202308111154"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="ff408bfbdc8e58514081e0457d97182f6c4ba646727bbf9f01882316860795f0"
-  arch=('arm64')
 else
   hash="3c3a322f77e17adf143d6840cd33870ef4469960db936fa13322a6f790c1e727"
-  arch=('amd64')
 fi
 url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${pkgver}/${CARCH}/${gives}_${buildver}_${CARCH}.deb"
 pkgdesc="Ubuntu Linux stable kernel (Generic headers)"

diff --git a/packages/linux-image-unsigned-deb/linux-image-unsigned-deb.pacscript b/packages/linux-image-unsigned-deb/linux-image-unsigned-deb.pacscript
@@ -2,12 +2,11 @@ name="linux-image-unsigned-deb"
 gives="linux-image-unsigned-6.5.0-060500rc7-generic"
 pkgver="6.5-rc7"
 buildver="6.5.0-060500rc7.202308201631"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="b5b6764fdbf8147dd26db00c4ff98043688b884f994901949eda04af950f1ab7"
-  arch=('arm64')
 else
   hash="b1b93354d43581b64607f4f98c2c434d28d3da00931361fa9ae787bed5f71d19"
-  arch=('amd64')
 fi
 url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${pkgver}/${CARCH}/${gives}_${buildver}_${CARCH}.deb"
 pkgdesc="Ubuntu Linux mainline kernel (Unsigned image)"

diff --git a/packages/linux-image-unsigned-stable-deb/linux-image-unsigned-stable-deb.pacscript b/packages/linux-image-unsigned-stable-deb/linux-image-unsigned-stable-deb.pacscript
@@ -2,12 +2,11 @@ name="linux-image-unsigned-stable-deb"
 gives="linux-image-unsigned-6.4.10-060410-generic"
 pkgver="6.4.10"
 buildver="6.4.10-060410.202308111154"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="64ced8afcde7857cff16a0d46bb6ca148c91ee2ff8daf1572d274e3d6afce8f2"
-  arch=('arm64')
 else
   hash="5766b8255de2082c3b56b2abfa8e91207126176f5cd6cf964b200859831b5bb2"
-  arch=('amd64')
 fi
 url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${pkgver}/${CARCH}/${gives}_${buildver}_${CARCH}.deb"
 pkgdesc="Ubuntu Linux stable kernel (Unsigned image)"

diff --git a/packages/linux-modules-deb/linux-modules-deb.pacscript b/packages/linux-modules-deb/linux-modules-deb.pacscript
@@ -2,12 +2,11 @@ name="linux-modules-deb"
 gives="linux-modules-6.5.0-060500rc7-generic"
 pkgver="6.5-rc7"
 buildver="6.5.0-060500rc7.202308201631"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="6ca5de9646642220909cd396955aacca3e29349b48d831e157d02abe09b39a94"
-  arch=('arm64')
 else
   hash="d03efbb6b1c4831c05ea10dbc1e32c09f0c75d718c42c802925184bbf397cdc5"
-  arch=('amd64')
 fi
 url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${pkgver}/${CARCH}/${gives}_${buildver}_${CARCH}.deb"
 pkgdesc="Ubuntu Linux mainline kernel (Linux Modules)"

diff --git a/packages/linux-modules-stable-deb/linux-modules-stable-deb.pacscript b/packages/linux-modules-stable-deb/linux-modules-stable-deb.pacscript
@@ -2,12 +2,11 @@ name="linux-modules-stable-deb"
 gives="linux-modules-6.4.10-060410-generic"
 pkgver="6.4.10"
 buildver="6.4.10-060410.202308111154"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="7353c6f083f23390d50193a465da04e97437d87e590069ae42b8ddb918db3cea"
-  arch=('arm64')
 else
   hash="33cf7dc0b61b5e880ae43e5d3e22369b0d21a3ab5b20044927efb3e06bfb35be"
-  arch=('amd64')
 fi
 url="https://kernel.ubuntu.com/~kernel-ppa/mainline/v${pkgver}/${CARCH}/${gives}_${buildver}_${CARCH}.deb"
 pkgdesc="Ubuntu Linux stable kernel (Linux Modules)"

diff --git a/packages/rhino-setup-bin/rhino-setup-bin.pacscript b/packages/rhino-setup-bin/rhino-setup-bin.pacscript
@@ -6,16 +6,13 @@ maintainer="Oren Klopfer <oren@taumoda.com>"
 incompatible=("debian:*")
 pkgver="2023.1"
 replace=("${gives}" "${gives}-git")
-
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == arm64 ]]; then
-  url="https://github.com/rhino-linux/${gives}/releases/download/v${pkgver}/${gives}_v${pkgver}_${CARCH}.zip"
   hash="b0f78e12d0ab74173936cf826d85e4fe66110a79ec6bd702fba27ca8bf9d6ae6"
-  arch=('arm64')
 else
-  url="https://github.com/rhino-linux/${gives}/releases/download/v${pkgver}/${gives}_v${pkgver}_${CARCH}.zip"
   hash="10f3dc3311b9f71f56616cee8c85e8df6c7ba1eee6a4dc1ba2afb73fad27fe29"
-  arch=('amd64')
 fi
+url="https://github.com/rhino-linux/${gives}/releases/download/v${pkgver}/${gives}_v${pkgver}_${CARCH}.zip"
 
 build() {
   sudo mkdir -p "${pkgdir}/usr"

diff --git a/packages/thorium-deb/thorium-deb.pacscript b/packages/thorium-deb/thorium-deb.pacscript
@@ -1,14 +1,13 @@
 name="thorium-deb"
 gives="thorium-browser"
 pkgver="115.0.5790.172"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   url="https://github.com/Alex313031/Thorium-Raspi/releases/download/${pkgver}/${gives}_${pkgver}_${CARCH}.deb"
   hash="ef5d78990afd676aa1a5c090493f3155db10c45b6978691bc0c326256b9b03e4"
-  arch=("arm64")
 else
   url="https://github.com/Alex313031/thorium/releases/download/M${pkgver}/${gives}_${pkgver}_${CARCH}.deb"
   hash="10fe1bd39e52a95fe1d155d89a1c0a19519ecc57f4ac8162b6d47ba271103450"
-  arch=('amd64')
 fi
 maintainer="Oren Klopfer <oren@taumoda.com>"
 pkgdesc="Chromium fork for linux with extra patches"

diff --git a/packages/vscodium-deb/vscodium-deb.pacscript b/packages/vscodium-deb/vscodium-deb.pacscript
@@ -2,12 +2,11 @@ name="vscodium-deb"
 gives="codium"
 breaks=("${gives}")
 pkgver="1.81.1.23222"
+arch=('arm64' 'amd64')
 if [[ ${CARCH} == "arm64" ]]; then
   hash="a74276c5ee5d4d8fd62e0dad85924c369c9d9c4180149e02c11819c971802195"
-  arch=('arm64')
 else
   hash="8d2324783b39ca8fea127c3d8c83f423c67782b7f143e1936e9c86187c86b2b0"
-  arch=('amd64')
 fi
 url="https://github.com/VSCodium/vscodium/releases/download/${pkgver}/${gives}_${pkgver}_${CARCH}.deb"
 repology=("project: vscodium")