From 3a1954ca3ea272183a2519528d161944714a7f4d Mon Sep 17 00:00:00 2001
From: V <150687949+vigress8@users.noreply.github.com>
Date: Sat, 4 May 2024 01:03:04 +0400
Subject: [PATCH] refactor(*): post-transition cleanup (#5935)

remove uses of `gnuarch` in `source`, redundant `post_{install,remove}()` blocks
---
 packages/ardour-git/ardour-git.pacscript      | 34 +++++--------------
 .../aws-cli-v2-bin/aws-cli-v2-bin.pacscript   |  6 ----
 packages/bazecor-app/bazecor-app.pacscript    | 12 +++----
 packages/bemenu-git/bemenu-git.pacscript      |  5 ---
 packages/bpytop-git/bpytop-git.pacscript      |  5 ---
 packages/clib/clib.pacscript                  |  3 --
 packages/cmatrix/cmatrix.pacscript            |  5 ---
 packages/doas-git/doas-git.pacscript          |  5 ---
 packages/docker-bin/.SRCINFO                  |  3 +-
 packages/docker-bin/docker-bin.pacscript      |  8 ++---
 packages/docker-compose-plugin-bin/.SRCINFO   |  3 +-
 .../docker-compose-plugin-bin.pacscript       | 13 +++----
 packages/endlessh-git/endlessh-git.pacscript  |  4 ---
 packages/exercism-cli-bin/.SRCINFO            |  3 +-
 .../exercism-cli-bin.pacscript                |  8 ++---
 .../fastfetch-git/fastfetch-git.pacscript     |  5 ---
 packages/floorp-bin/.SRCINFO                  |  3 +-
 packages/floorp-bin/floorp-bin.pacscript      |  8 ++---
 packages/flyctl-bin/.SRCINFO                  |  3 +-
 packages/flyctl-bin/flyctl-bin.pacscript      |  8 ++---
 .../genymotion-bin/genymotion-bin.pacscript   |  4 ---
 ...me-shell-extension-installer-git.pacscript |  5 ---
 packages/gtkhash/gtkhash.pacscript            |  5 ---
 .../hyperfine-bin/hyperfine-bin.pacscript     |  5 ---
 packages/intellij-idea-community-bin/.SRCINFO |  6 ++--
 .../intellij-idea-community-bin.pacscript     | 13 ++++---
 packages/librewolf-app/.SRCINFO               |  9 +++--
 .../librewolf-app/librewolf-app.pacscript     | 21 ++++++++----
 packages/librewolf-deb/.SRCINFO               |  7 ++--
 .../librewolf-deb/librewolf-deb.pacscript     | 14 +++-----
 packages/mutt-wizard/mutt-wizard.pacscript    |  5 ---
 packages/nushell-bin/.SRCINFO                 |  3 +-
 packages/nushell-bin/nushell-bin.pacscript    |  8 ++---
 packages/opendoas-git/opendoas-git.pacscript  |  6 ----
 packages/pacget-git/pacget-git.pacscript      |  3 --
 packages/pipes.sh-bin/pipes.sh-bin.pacscript  |  5 ---
 .../qogir-icon-theme-bin.pacscript            |  5 ---
 packages/smartgit/smartgit.pacscript          |  1 -
 packages/soundux/soundux.pacscript            |  5 ---
 .../spacecadetpinball-git.pacscript           |  4 ---
 packages/surf/surf.pacscript                  |  5 ---
 packages/taskwarrior/taskwarrior.pacscript    | 12 -------
 packages/timeshift/timeshift.pacscript        |  9 +++--
 packages/tmpmail-bin/tmpmail-bin.pacscript    |  5 ---
 packages/topgrade-bin/.SRCINFO                |  3 +-
 packages/topgrade-bin/topgrade-bin.pacscript  |  8 ++---
 packages/uwufetch/uwufetch.pacscript          |  5 ---
 packages/watchexec-bin/.SRCINFO               |  3 +-
 .../watchexec-bin/watchexec-bin.pacscript     |  8 ++---
 packages/wezterm-bin/wezterm-bin.pacscript    |  8 -----
 packages/zig-bin/.SRCINFO                     |  3 +-
 packages/zig-bin/zig-bin.pacscript            |  8 ++---
 52 files changed, 94 insertions(+), 261 deletions(-)

diff --git a/packages/ardour-git/ardour-git.pacscript b/packages/ardour-git/ardour-git.pacscript
index 1ecf97141e..2fa6bba594 100644
--- a/packages/ardour-git/ardour-git.pacscript
+++ b/packages/ardour-git/ardour-git.pacscript
@@ -20,8 +20,6 @@ prepare() {
   # will be applied when ubuntu starts supporting qm-dsp 1.8.0
   # unsetting gtk2 rc (FS#54389)
   sed -e '8iexport GTK2_RC_FILES=/dev/null' -i "gtk2_ardour/ardour.sh.in"
-
-  git fetch --unshallow && git pull
 }
 
 build() {
@@ -49,37 +47,21 @@ package() {
   wait
 
   # man pages
-  install -vDm 644 "./ardour.1" -t "/usr/share/man/man1/"
+  install -vDm 644 "./ardour.1" -t "${pkgdir}/usr/share/man/man1/"
 
   # File types
-  install -vDm 644 "./build/gtk2_ardour/ardour.xml" -t "/usr/share/mime/packages/"
-}
+  install -vDm 644 "./build/gtk2_ardour/ardour.xml" -t "${pkgdir}/usr/share/mime/packages/"
 
-post_install() {
   # Icons
   for size in 16 22 32 48; do
-    sudo install -vdm 755 "/usr/share/icons/hicolor/${size}x${size}/mimetypes"
-    sudo install -vDm 644 "/usr/share/ardour7/icons/application-x-ardour_${size}px.png" "/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-ardour.png"
-  done
-
-  for size in 16 22 32 48 256 512; do
-    sudo install -vdm 755 "/usr/share/icons/hicolor/${size}x${size}/apps"
-    sudo install -vDm 644 "/usr/share/ardour7/resources/Ardour-icon_${size}px.png" "/usr/share/icons/hicolor/${size}x${size}/apps/ardour.png"
+    install -vdm 755 "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes"
+    install -vDm 644 "${pkgdir}/usr/share/ardour7/icons/application-x-ardour_${size}px.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-ardour.png"
   done
-}
 
-post_remove() {
-  sudo rm -f "/usr/bin/ardour7-copy-mixer"
-  sudo rm -f "/usr/bin/ardour7-export"
-  sudo rm -f "/usr/bin/ardour7-fix_bbtppq"
-  sudo rm -f "/usr/bin/ardour7-new_empty_session"
-  sudo rm -f "/usr/bin/ardour7-copy-new_session"
-  sudo rm -f "/usr/share/applications/ardour7.desktop"
-  sudo rm -f "/usr/share/mime/packages/ardour.xml"
-  for size in 16 22 32 48; do
-    sudo rm -f "/usr/share/icons/hicolor/${size}x${size}/mimetypes/application-x-ardour.png"
-  done
   for size in 16 22 32 48 256 512; do
-    sudo rm -f "/usr/share/icons/hicolor/${size}x${size}/apps/ardour.png"
+    install -vdm 755 "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps"
+    install -vDm 644 "${pkgdir}/usr/share/ardour7/resources/Ardour-icon_${size}px.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/ardour.png"
   done
 }
diff --git a/packages/aws-cli-v2-bin/aws-cli-v2-bin.pacscript b/packages/aws-cli-v2-bin/aws-cli-v2-bin.pacscript
index 0f0883de97..f642e34193 100644
--- a/packages/aws-cli-v2-bin/aws-cli-v2-bin.pacscript
+++ b/packages/aws-cli-v2-bin/aws-cli-v2-bin.pacscript
@@ -20,9 +20,3 @@ package() {
 
   install -Dm644 aws-cli_bash_completion "${pkgdir}/etc/bash_completion.d/${gives}"
 }
-
-post_remove() {
-  sudo rm -f /usr/local/bin/aws
-  sudo rm -f /usr/local/bin/aws_completer
-  sudo rm -rf /usr/local/aws-cli/
-}
diff --git a/packages/bazecor-app/bazecor-app.pacscript b/packages/bazecor-app/bazecor-app.pacscript
index cea9a02c23..28d470fe64 100644
--- a/packages/bazecor-app/bazecor-app.pacscript
+++ b/packages/bazecor-app/bazecor-app.pacscript
@@ -30,9 +30,7 @@ X-AppImage-Version=${pkgver}
 Categories=Utility;" | tee "${pkgdir}/usr/share/applications/bazecor.desktop" > /dev/null
   install -Dm644 "${srcdir}/bazecor.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/bazecor.png"
   install -Dm755 "Bazecor-${pkgver}-x64.AppImage" "${pkgdir}/usr/bin/${gives}"
-}
 
-post_install() {
   # Run `lsusb` to get the IDs for the currently attached Dygma keyboard.
   idstring="$(lsusb | grep Dygma | grep -o 'ID.*:[[:alnum:]]*' | sed 's/ID //')"
 
@@ -44,13 +42,11 @@ post_install() {
   line="SUBSYSTEMS==\"usb\", ATTRS{idVendor}==\"${YYYY}\", ATTRS{idProduct}==\"${XXXX}\", GROUP=\"users\", MODE=\"0666\""
 
   # Generate the rule file.
-  mkdir -p /etc/udev/rules.d/
-  echo "${line}" | sudo tee /etc/udev/rules.d/50-dygma.rules > /dev/null
+  mkdir -p "${pkgdir}/etc/udev/rules.d/"
+  echo "${line}" | tee "${pkgdir}/etc/udev/rules.d/50-dygma.rules" > /dev/null
+}
 
+post_install() {
   # Reload the `udev` rules.
   udevadm control --reload-rules || :
 }
-
-post_remove() {
-  sudo rm -f /etc/udev/rules.d/50-dygma.rules
-}
diff --git a/packages/bemenu-git/bemenu-git.pacscript b/packages/bemenu-git/bemenu-git.pacscript
index 0460ad2b1f..1b469fa045 100644
--- a/packages/bemenu-git/bemenu-git.pacscript
+++ b/packages/bemenu-git/bemenu-git.pacscript
@@ -32,9 +32,4 @@ package() {
   make install DESTDIR="${pkgdir}"
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/bpytop-git/bpytop-git.pacscript b/packages/bpytop-git/bpytop-git.pacscript
index b0565bfcf4..2fbe054472 100644
--- a/packages/bpytop-git/bpytop-git.pacscript
+++ b/packages/bpytop-git/bpytop-git.pacscript
@@ -22,8 +22,3 @@ package() {
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${gives}"
   install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${gives}"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
diff --git a/packages/clib/clib.pacscript b/packages/clib/clib.pacscript
index 0c178bbe0c..d4cf856b4f 100644
--- a/packages/clib/clib.pacscript
+++ b/packages/clib/clib.pacscript
@@ -20,7 +20,4 @@ package() {
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${pkgname}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/cmatrix/cmatrix.pacscript b/packages/cmatrix/cmatrix.pacscript
index a8f5e2952c..7914199a72 100644
--- a/packages/cmatrix/cmatrix.pacscript
+++ b/packages/cmatrix/cmatrix.pacscript
@@ -19,8 +19,3 @@ package() {
   install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
   install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${pkgname}"
-  sudo rm -rf "/usr/share/doc/${pkgname}"
-}
diff --git a/packages/doas-git/doas-git.pacscript b/packages/doas-git/doas-git.pacscript
index abecb72dff..b74c8f2c46 100644
--- a/packages/doas-git/doas-git.pacscript
+++ b/packages/doas-git/doas-git.pacscript
@@ -48,9 +48,4 @@ post_install() {
   fancy_message info "by adding your username or other values"
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/docker-bin/.SRCINFO b/packages/docker-bin/.SRCINFO
index 8543124cc5..06dfcb21e7 100644
--- a/packages/docker-bin/.SRCINFO
+++ b/packages/docker-bin/.SRCINFO
@@ -4,7 +4,6 @@ pkgver = 24.0.7
 pkgdesc = Docker Engine Static Binaries
 arch = arm64
 arch = amd64
-source = https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz
 depends = procps
 depends = git
 depends = iptables
@@ -13,5 +12,7 @@ replaces = docker-desktop
 replaces = docker-ce
 replaces = docker-ce-cli
 replaces = containerd.io
+source_amd64 = https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz
+source_arm64 = https://download.docker.com/linux/static/stable/aarch64/docker-24.0.7.tgz
 sha256sums_amd64 = 984d59a77fa6acab97ea725a966facd33725e0e09c2fee975397fe1c6379bd3d
 sha256sums_arm64 = fe6cf4b509307665af542a89454c2ecfbbd62670fc5a5d17bac7150a6f6a6776
diff --git a/packages/docker-bin/docker-bin.pacscript b/packages/docker-bin/docker-bin.pacscript
index ba43097044..792a901d7e 100644
--- a/packages/docker-bin/docker-bin.pacscript
+++ b/packages/docker-bin/docker-bin.pacscript
@@ -9,12 +9,8 @@ maintainer=("Oren Klopfer <oren@taumoda.com>")
 arch=('arm64' 'amd64')
 sha256sums_arm64=("fe6cf4b509307665af542a89454c2ecfbbd62670fc5a5d17bac7150a6f6a6776")
 sha256sums_amd64=("984d59a77fa6acab97ea725a966facd33725e0e09c2fee975397fe1c6379bd3d")
-if [[ ${CARCH} == arm64 ]]; then
-  gnuarch="aarch64"
-else
-  gnuarch="x86_64"
-fi
-source=("https://download.docker.com/linux/static/stable/${gnuarch}/${gives}-${pkgver}.tgz")
+source_amd64=("https://download.docker.com/linux/static/stable/x86_64/${gives}-${pkgver}.tgz")
+source_arm64=("https://download.docker.com/linux/static/stable/aarch64/${gives}-${pkgver}.tgz")
 
 build() {
   cd "${_archive}"
diff --git a/packages/docker-compose-plugin-bin/.SRCINFO b/packages/docker-compose-plugin-bin/.SRCINFO
index 0e2fc7d7c4..f80766e410 100644
--- a/packages/docker-compose-plugin-bin/.SRCINFO
+++ b/packages/docker-compose-plugin-bin/.SRCINFO
@@ -4,7 +4,8 @@ pkgver = 2.24.7
 pkgdesc = Docker Compose cli plugin
 arch = amd64
 arch = arm64
-source = https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64
 replaces = docker-compose-plugin
+source_amd64 = https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64
+source_arm64 = https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64
 sha256sums_amd64 = 19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f
 sha256sums_arm64 = 86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53
diff --git a/packages/docker-compose-plugin-bin/docker-compose-plugin-bin.pacscript b/packages/docker-compose-plugin-bin/docker-compose-plugin-bin.pacscript
index 9addf8eb79..e54507edfa 100644
--- a/packages/docker-compose-plugin-bin/docker-compose-plugin-bin.pacscript
+++ b/packages/docker-compose-plugin-bin/docker-compose-plugin-bin.pacscript
@@ -9,14 +9,15 @@ repology=("project: docker-compose")
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 sha256sums_amd64=("19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f")
 sha256sums_arm64=("86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53")
-if [[ ${CARCH} == amd64 ]]; then
-  gnuarch="x86_64"
-else
-  gnuarch="aarch64"
-fi
-source=("https://github.com/docker/compose/releases/download/v${pkgver}/docker-compose-linux-${gnuarch}")
+source_amd64=("https://github.com/docker/compose/releases/download/v${pkgver}/docker-compose-linux-x86_64")
+source_arm64=("https://github.com/docker/compose/releases/download/v${pkgver}/docker-compose-linux-aarch64")
 
 package() {
+  if [[ ${CARCH} == amd64 ]]; then
+    gnuarch="x86_64"
+  else
+    gnuarch="aarch64"
+  fi
   cd "${_archive}"
   mkdir -p "${pkgdir}/usr/libexec/docker/cli-plugins"
   chmod a+x ./"docker-compose-linux-${gnuarch}"
diff --git a/packages/endlessh-git/endlessh-git.pacscript b/packages/endlessh-git/endlessh-git.pacscript
index 17823f15cb..71e49dc698 100644
--- a/packages/endlessh-git/endlessh-git.pacscript
+++ b/packages/endlessh-git/endlessh-git.pacscript
@@ -26,8 +26,4 @@ package() {
   install -Dm644 "${srcdir}"/sample-config "${pkgdir}/etc/endlessh/config"
 }
 
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/exercism-cli-bin/.SRCINFO b/packages/exercism-cli-bin/.SRCINFO
index 8f21a459ab..be56a6322f 100644
--- a/packages/exercism-cli-bin/.SRCINFO
+++ b/packages/exercism-cli-bin/.SRCINFO
@@ -3,6 +3,7 @@ pkgver = 3.2.0
 pkgdesc = Go based command line tool for exercism.org
 arch = amd64
 arch = arm64
-source = https://github.com/exercism/cli/releases/download/v3.2.0/exercism-3.2.0-linux-arm64.tar.gz
+source_amd64 = https://github.com/exercism/cli/releases/download/v3.2.0/exercism-3.2.0-linux-x86_64.tar.gz
+source_arm64 = https://github.com/exercism/cli/releases/download/v3.2.0/exercism-3.2.0-linux-arm64.tar.gz
 sha256sums_amd64 = 4ea3e1ea8916a8003da95dbd6eef7a3a29802e637ed6a0f2aaaa2f1c98754915
 sha256sums_arm64 = 57f9620e5346bf045ca72b581cb106f9dc56841ac1ff0a3070188c49d5d0b573
diff --git a/packages/exercism-cli-bin/exercism-cli-bin.pacscript b/packages/exercism-cli-bin/exercism-cli-bin.pacscript
index 70dd115bde..fb46e1b199 100644
--- a/packages/exercism-cli-bin/exercism-cli-bin.pacscript
+++ b/packages/exercism-cli-bin/exercism-cli-bin.pacscript
@@ -4,12 +4,8 @@ pkgver="3.2.0"
 arch=('amd64' 'arm64')
 sha256sums_amd64=("4ea3e1ea8916a8003da95dbd6eef7a3a29802e637ed6a0f2aaaa2f1c98754915")
 sha256sums_arm64=("57f9620e5346bf045ca72b581cb106f9dc56841ac1ff0a3070188c49d5d0b573")
-if [[ ${CARCH} == amd64 ]]; then
-    arch_suffix="x86_64"
-else
-    arch_suffix="arm64"
-fi
-source=("https://github.com/exercism/cli/releases/download/v${pkgver}/exercism-${pkgver}-linux-${arch_suffix}.tar.gz")
+source_amd64=("https://github.com/exercism/cli/releases/download/v${pkgver}/exercism-${pkgver}-linux-x86_64.tar.gz")
+source_arm64=("https://github.com/exercism/cli/releases/download/v${pkgver}/exercism-${pkgver}-linux-arm64.tar.gz")
 pkgdesc="Go based command line tool for exercism.org"
 homepage='https://exercism.org'
 maintainer=("Andrew Barchuk <andrew@raindev.io>")
diff --git a/packages/fastfetch-git/fastfetch-git.pacscript b/packages/fastfetch-git/fastfetch-git.pacscript
index c9e9d3598f..6f57259787 100644
--- a/packages/fastfetch-git/fastfetch-git.pacscript
+++ b/packages/fastfetch-git/fastfetch-git.pacscript
@@ -58,11 +58,6 @@ package() {
 }
 
 post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-  sudo rm -rf "/usr/share/${gives}"
-
   # Remove left over directories
   if ask "Do you want to remove the configuration files?" Y; then
     rm -rf "${homedir}/.config/fastfetch"
diff --git a/packages/floorp-bin/.SRCINFO b/packages/floorp-bin/.SRCINFO
index 82c9c87f7a..4779b5b6e0 100644
--- a/packages/floorp-bin/.SRCINFO
+++ b/packages/floorp-bin/.SRCINFO
@@ -4,6 +4,7 @@ pkgver = 11.10.5
 pkgdesc = Firefox-based Browser build for keeping the Open, Private and Sustainable Web alive
 arch = amd64
 arch = arm64
-source = https://github.com/Floorp-Projects/Floorp/releases/download/v11.10.5/floorp-11.10.5.linux-aarch64.tar.bz2
+source_amd64 = https://github.com/Floorp-Projects/Floorp/releases/download/v11.10.5/floorp-11.10.5.linux-x86_64.tar.bz2
+source_arm64 = https://github.com/Floorp-Projects/Floorp/releases/download/v11.10.5/floorp-11.10.5.linux-aarch64.tar.bz2
 sha256sums_amd64 = 64d264d503a669188e2b38db07490a8a7d82a114c0f18c6b18d4253e6e8af710
 sha256sums_arm64 = 695dc6185df33b5ee22b802f3ba1d0043c1ebe366cce2a897431dcd8e77fa922
diff --git a/packages/floorp-bin/floorp-bin.pacscript b/packages/floorp-bin/floorp-bin.pacscript
index 99166b7ef1..6b771cda4f 100644
--- a/packages/floorp-bin/floorp-bin.pacscript
+++ b/packages/floorp-bin/floorp-bin.pacscript
@@ -4,12 +4,8 @@ pkgver="11.10.5"
 repology=("project: ${gives}")
 sha256sums_amd64=("64d264d503a669188e2b38db07490a8a7d82a114c0f18c6b18d4253e6e8af710")
 sha256sums_arm64=("695dc6185df33b5ee22b802f3ba1d0043c1ebe366cce2a897431dcd8e77fa922")
-if [[ ${CARCH} == amd64 ]]; then
-  gnuarch="x86_"
-else
-  gnuarch="aarch"
-fi
-source=("https://github.com/Floorp-Projects/Floorp/releases/download/v${pkgver}/${gives}-${pkgver}.linux-${gnuarch}64.tar.bz2")
+source_amd64=("https://github.com/Floorp-Projects/Floorp/releases/download/v${pkgver}/${gives}-${pkgver}.linux-x86_64.tar.bz2")
+source_arm64=("https://github.com/Floorp-Projects/Floorp/releases/download/v${pkgver}/${gives}-${pkgver}.linux-aarch64.tar.bz2")
 homepage='https://floorp.app/'
 pkgdesc="Firefox-based Browser build for keeping the Open, Private and Sustainable Web alive"
 maintainer=("Oren Klopfer <oren@taumoda.com>")
diff --git a/packages/flyctl-bin/.SRCINFO b/packages/flyctl-bin/.SRCINFO
index 04c64de440..074d582cd7 100644
--- a/packages/flyctl-bin/.SRCINFO
+++ b/packages/flyctl-bin/.SRCINFO
@@ -3,6 +3,7 @@ pkgver = 0.2.31
 pkgdesc = Command line tool for fly.io services
 arch = amd64
 arch = arm64
-source = https://github.com/superfly/flyctl/releases/download/v0.2.31/flyctl_0.2.31_Linux_arm64.tar.gz
+source_amd64 = https://github.com/superfly/flyctl/releases/download/v0.2.31/flyctl_0.2.31_Linux_x86_64.tar.gz
+source_arm64 = https://github.com/superfly/flyctl/releases/download/v0.2.31/flyctl_0.2.31_Linux_arm64.tar.gz
 sha256sums_amd64 = 2af82bd13c9fed05fd11682ddc646c436353c87519d91482350d7a0edbb59841
 sha256sums_arm64 = b7d5b38c6e6e0d6907520db81caf66cefd086a34d959b9d1fcf7427510f63c60
diff --git a/packages/flyctl-bin/flyctl-bin.pacscript b/packages/flyctl-bin/flyctl-bin.pacscript
index aada8c36f1..3f76220a85 100644
--- a/packages/flyctl-bin/flyctl-bin.pacscript
+++ b/packages/flyctl-bin/flyctl-bin.pacscript
@@ -4,12 +4,8 @@ pkgver="0.2.31"
 arch=("amd64" "arm64")
 sha256sums_amd64=("2af82bd13c9fed05fd11682ddc646c436353c87519d91482350d7a0edbb59841")
 sha256sums_arm64=("b7d5b38c6e6e0d6907520db81caf66cefd086a34d959b9d1fcf7427510f63c60")
-if [[ ${CARCH} == amd64 ]]; then
-    arch_suffix="x86_64"
-else
-    arch_suffix="arm64"
-fi
-source=("https://github.com/superfly/flyctl/releases/download/v${pkgver}/flyctl_${pkgver}_Linux_${arch_suffix}.tar.gz")
+source_amd64=("https://github.com/superfly/flyctl/releases/download/v${pkgver}/flyctl_${pkgver}_Linux_x86_64.tar.gz")
+source_arm64=("https://github.com/superfly/flyctl/releases/download/v${pkgver}/flyctl_${pkgver}_Linux_arm64.tar.gz")
 pkgdesc="Command line tool for fly.io services"
 homepage='https://fly.io'
 maintainer=("Andrew Barchuk <andrew@raindev.io>")
diff --git a/packages/genymotion-bin/genymotion-bin.pacscript b/packages/genymotion-bin/genymotion-bin.pacscript
index 4ac383ebaa..b4bb6e264e 100644
--- a/packages/genymotion-bin/genymotion-bin.pacscript
+++ b/packages/genymotion-bin/genymotion-bin.pacscript
@@ -45,7 +45,3 @@ Terminal=false
 Categories=Development;
 END
 }
-
-post_remove() {
-  sudo rm -rf "/opt/${gives}"
-}
diff --git a/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript b/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript
index 4b707cdccb..135c77b85c 100644
--- a/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript
+++ b/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript
@@ -12,8 +12,3 @@ package() {
   install -Dm644 "LICENSE" -t "${pkgdir}/usr/share/licenses/${gives}"
   install -Dm644 "README.md" -t "${pkgdir}/usr/share/doc/${gives}"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
diff --git a/packages/gtkhash/gtkhash.pacscript b/packages/gtkhash/gtkhash.pacscript
index 6f06f645fa..0adedb6ce3 100644
--- a/packages/gtkhash/gtkhash.pacscript
+++ b/packages/gtkhash/gtkhash.pacscript
@@ -19,8 +19,3 @@ package() {
   install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
   install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${pkgname}"
-  sudo rm -rf "/usr/share/doc/${pkgname}"
-}
diff --git a/packages/hyperfine-bin/hyperfine-bin.pacscript b/packages/hyperfine-bin/hyperfine-bin.pacscript
index f929043691..9c545295fd 100644
--- a/packages/hyperfine-bin/hyperfine-bin.pacscript
+++ b/packages/hyperfine-bin/hyperfine-bin.pacscript
@@ -37,9 +37,4 @@ package() {
   gzip --best "${pkgdir}/usr/share/man/man1/${gives}.1"
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/intellij-idea-community-bin/.SRCINFO b/packages/intellij-idea-community-bin/.SRCINFO
index 6d8a3982ec..b5942e4f07 100644
--- a/packages/intellij-idea-community-bin/.SRCINFO
+++ b/packages/intellij-idea-community-bin/.SRCINFO
@@ -4,8 +4,10 @@ pkgver = 2024.1
 pkgdesc = IntelliJ IDEA is an IDE for developing computer software written in Java, Kotlin, Groovy, and other JVM-based languages
 arch = amd64
 arch = arm64
-source = https://download-cdn.jetbrains.com/idea/ideaIC-2024.1-aarch64.tar.gz
-source = intellij-idea-community.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/intellij-idea-community-bin/intellij-idea-community.desktop
+source_amd64 = https://download-cdn.jetbrains.com/idea/ideaIC-2024.1.tar.gz
+source_amd64 = intellij-idea-community.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/intellij-idea-community-bin/intellij-idea-community.desktop
+source_arm64 = https://download-cdn.jetbrains.com/idea/ideaIC-2024.1-aarch64.tar.gz
+source_arm64 = intellij-idea-community.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/intellij-idea-community-bin/intellij-idea-community.desktop
 sha256sums_amd64 = 01d1b224c5e88592f954b17796a76fa8391cdcafef27264e703c7ffe47bb4065
 sha256sums_amd64 = 20c489d224f83cf4b29174b8c398e256b1df0e9cb0b920890f39c5796404b293
 sha256sums_arm64 = a13e7a53b5c8a512fbcb72957f24e5515618a5533f17d72914da5445b736dac1
diff --git a/packages/intellij-idea-community-bin/intellij-idea-community-bin.pacscript b/packages/intellij-idea-community-bin/intellij-idea-community-bin.pacscript
index 9175e32e38..80ecc94c2d 100644
--- a/packages/intellij-idea-community-bin/intellij-idea-community-bin.pacscript
+++ b/packages/intellij-idea-community-bin/intellij-idea-community-bin.pacscript
@@ -13,13 +13,12 @@ sha256sums_arm64=(
   "a13e7a53b5c8a512fbcb72957f24e5515618a5533f17d72914da5445b736dac1"
   "20c489d224f83cf4b29174b8c398e256b1df0e9cb0b920890f39c5796404b293"
 )
-if [[ ${CARCH} == amd64 ]]; then
-  archext="${pkgver}"
-else
-  archext="${pkgver}-aarch64"
-fi
-source=(
-  "https://download-cdn.jetbrains.com/idea/ideaIC-${archext}.tar.gz"
+source_amd64=(
+  "https://download-cdn.jetbrains.com/idea/ideaIC-${pkgver}.tar.gz"
+  "intellij-idea-community.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/${pkgname}/intellij-idea-community.desktop"
+)
+source_arm64=(
+  "https://download-cdn.jetbrains.com/idea/ideaIC-${pkgver}-aarch64.tar.gz"
   "intellij-idea-community.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/${pkgname}/intellij-idea-community.desktop"
 )
 repology=("project: intellij-idea-community")
diff --git a/packages/librewolf-app/.SRCINFO b/packages/librewolf-app/.SRCINFO
index 7916c479e3..ca8ec2344c 100644
--- a/packages/librewolf-app/.SRCINFO
+++ b/packages/librewolf-app/.SRCINFO
@@ -4,12 +4,15 @@ pkgver = 121.0-1
 pkgdesc = A fork of Firefox, focused on privacy, security and freedom.
 arch = amd64
 arch = arm64
-source = https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/121.0-1/LibreWolf.aarch64.AppImage
-source = icon.png::https://gitlab.com/uploads/-/system/group/avatar/5407097/icon.png
-source = librewolf.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/librewolf-app/librewolf.desktop
 breaks = librewolf-deb
 breaks = librewolf-bin
 breaks = librewolf-git
+source_amd64 = https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/121.0-1/LibreWolf.x86_64.AppImage
+source_amd64 = icon.png::https://gitlab.com/uploads/-/system/group/avatar/5407097/icon.png
+source_amd64 = librewolf.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/librewolf-app/librewolf.desktop
+source_arm64 = https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/121.0-1/LibreWolf.aarch64.AppImage
+source_arm64 = icon.png::https://gitlab.com/uploads/-/system/group/avatar/5407097/icon.png
+source_arm64 = librewolf.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/librewolf-app/librewolf.desktop
 sha256sums_amd64 = 63178bcc1feacc94f657ea86cf86aac8d8e272e7646ddef189eede99236fd81e
 sha256sums_amd64 = SKIP
 sha256sums_amd64 = SKIP
diff --git a/packages/librewolf-app/librewolf-app.pacscript b/packages/librewolf-app/librewolf-app.pacscript
index 6b7d5b5b6f..178a8d52b7 100644
--- a/packages/librewolf-app/librewolf-app.pacscript
+++ b/packages/librewolf-app/librewolf-app.pacscript
@@ -14,13 +14,13 @@ sha256sums_arm64=(
   "SKIP"
   "SKIP"
 )
-if [[ ${CARCH} == amd64 ]]; then
-  gnuarch="x86_64"
-else
-  gnuarch="aarch64"
-fi
-source=(
-  "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${pkgver}/LibreWolf.${gnuarch}.AppImage"
+source_amd64=(
+  "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${pkgver}/LibreWolf.x86_64.AppImage"
+  "icon.png::https://gitlab.com/uploads/-/system/group/avatar/5407097/icon.png"
+  "${gives}.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/${pkgname}/${gives}.desktop"
+)
+source_arm64=(
+  "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${pkgver}/LibreWolf.aarch64.AppImage"
   "icon.png::https://gitlab.com/uploads/-/system/group/avatar/5407097/icon.png"
   "${gives}.desktop::https://raw.githubusercontent.com/pacstall/pacstall-programs/master/packages/${pkgname}/${gives}.desktop"
 )
@@ -28,6 +28,12 @@ breaks=("${gives}-deb" "${gives}-bin" "${gives}-git")
 repology=("project: librewolf")
 
 package() {
+  if [[ ${CARCH} == amd64 ]]; then
+    gnuarch="x86_64"
+  else
+    gnuarch="aarch64"
+  fi
+
   cd "${_archive}"
   # Install appimage
   install -Dm755 "LibreWolf.${gnuarch}.AppImage" "${pkgdir}/usr/bin/${gives}"
@@ -47,4 +53,5 @@ post_remove() {
     fi
   fi
 }
+
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/librewolf-deb/.SRCINFO b/packages/librewolf-deb/.SRCINFO
index 0d788c2bab..a3a02a7451 100644
--- a/packages/librewolf-deb/.SRCINFO
+++ b/packages/librewolf-deb/.SRCINFO
@@ -1,13 +1,12 @@
 pkgname = librewolf-deb
 gives = librewolf
-pkgver = 107.0.1-2
+pkgver = 121.0-1
 pkgdesc = A fork of Firefox, focused on privacy, security and freedom
 arch = amd64
-arch = any
-source = https://deb.librewolf.net/pool/jammy/librewolf_107.0.1-2_all.deb
+source = https://deb.librewolf.net/pool/jammy/librewolf-121.0-1.en-US.ubuntu22.x86_64.deb
 breaks = librewolf-app
 breaks = librewolf-bin
 breaks = librewolf-git
 replaces = librewolf
 incompatible = debian:bullseye
-sha256sums = c66df74a6f466821ecbf5402d18d4537d513a4bcc25b25d99301dca6e07ad85e
+sha256sums = 1b7105ba3b8ad8e084e02eb7bbe46377c178ef49543b4fad0d48f31c2df80ec6
diff --git a/packages/librewolf-deb/librewolf-deb.pacscript b/packages/librewolf-deb/librewolf-deb.pacscript
index 5c99097ba1..cf24af5135 100644
--- a/packages/librewolf-deb/librewolf-deb.pacscript
+++ b/packages/librewolf-deb/librewolf-deb.pacscript
@@ -6,13 +6,7 @@ breaks=("${gives}-app" "${gives}-bin" "${gives}-git")
 repology=("project: librewolf")
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 incompatible=('debian:bullseye')
-arch=("amd64" "any")
-if [[ ${CARCH} != "amd64" ]]; then
-  pkgver="107.0.1-2"
-  source=("https://deb.librewolf.net/pool/jammy/${gives}_${pkgver}_all.deb")
-  sha256sums=("c66df74a6f466821ecbf5402d18d4537d513a4bcc25b25d99301dca6e07ad85e")
-else
-  pkgver="121.0-1"
-  source=("https://deb.librewolf.net/pool/jammy/${gives}-${pkgver}.en-US.ubuntu22.x86_64.deb")
-  sha256sums=("1b7105ba3b8ad8e084e02eb7bbe46377c178ef49543b4fad0d48f31c2df80ec6")
-fi
+arch=("amd64")
+pkgver="121.0-1"
+source=("https://deb.librewolf.net/pool/jammy/${gives}-${pkgver}.en-US.ubuntu22.x86_64.deb")
+sha256sums=("1b7105ba3b8ad8e084e02eb7bbe46377c178ef49543b4fad0d48f31c2df80ec6")
diff --git a/packages/mutt-wizard/mutt-wizard.pacscript b/packages/mutt-wizard/mutt-wizard.pacscript
index 78449507f2..bca1c986a8 100644
--- a/packages/mutt-wizard/mutt-wizard.pacscript
+++ b/packages/mutt-wizard/mutt-wizard.pacscript
@@ -31,8 +31,3 @@ package() {
   install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${pkgname}"
-  sudo rm -rf "/usr/share/doc/${pkgname}"
-}
diff --git a/packages/nushell-bin/.SRCINFO b/packages/nushell-bin/.SRCINFO
index d5c5aaf99d..d72fc01698 100644
--- a/packages/nushell-bin/.SRCINFO
+++ b/packages/nushell-bin/.SRCINFO
@@ -3,10 +3,11 @@ pkgver = 0.92.2
 pkgdesc = A new type of shell
 arch = arm64
 arch = amd64
-source = https://github.com/nushell/nushell/releases/download/0.92.2/nu-0.92.2-x86_64-unknown-linux-gnu.tar.gz
 breaks = nushell
 breaks = nushell-git
 breaks = nushell-deb
 breaks = nushell-app
+source_amd64 = https://github.com/nushell/nushell/releases/download/0.92.2/nu-0.92.2-x86_64-unknown-linux-gnu.tar.gz
+source_arm64 = https://github.com/nushell/nushell/releases/download/0.92.2/nu-0.92.2-aarch64-unknown-linux-gnu.tar.gz
 sha256sums_amd64 = f6e726ebbb570cec27ad2e1f2d4bd7c78faf338920c7136566d70607aa50a167
 sha256sums_arm64 = 1585e9fe41189b49f479f39f871e6457aedc8732775a2db21ea13c7b6e580181
diff --git a/packages/nushell-bin/nushell-bin.pacscript b/packages/nushell-bin/nushell-bin.pacscript
index 72b74a82a5..832424bda5 100644
--- a/packages/nushell-bin/nushell-bin.pacscript
+++ b/packages/nushell-bin/nushell-bin.pacscript
@@ -17,12 +17,8 @@ repology=("project: nushell")
 arch=('arm64' 'amd64')
 sha256sums_arm64=("1585e9fe41189b49f479f39f871e6457aedc8732775a2db21ea13c7b6e580181")
 sha256sums_amd64=("f6e726ebbb570cec27ad2e1f2d4bd7c78faf338920c7136566d70607aa50a167")
-if [[ ${CARCH} == arm64 ]]; then
-  gnuarch="aarch64"
-else
-  gnuarch="x86_64"
-fi
-source=("https://github.com/nushell/nushell/releases/download/${pkgver}/nu-${pkgver}-${gnuarch}-unknown-linux-gnu.tar.gz")
+source_amd64=("https://github.com/nushell/nushell/releases/download/${pkgver}/nu-${pkgver}-x86_64-unknown-linux-gnu.tar.gz")
+source_arm64=("https://github.com/nushell/nushell/releases/download/${pkgver}/nu-${pkgver}-aarch64-unknown-linux-gnu.tar.gz")
 
 package() {
   cd "${_archive}"
diff --git a/packages/opendoas-git/opendoas-git.pacscript b/packages/opendoas-git/opendoas-git.pacscript
index 6d93653cdd..0a83ca1f2b 100644
--- a/packages/opendoas-git/opendoas-git.pacscript
+++ b/packages/opendoas-git/opendoas-git.pacscript
@@ -37,10 +37,4 @@ package() {
   echo "permit persist ${LOGNAME} as root" | tee "${pkgdir}/etc/doas.conf" > /dev/null
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
-
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/pacget-git/pacget-git.pacscript b/packages/pacget-git/pacget-git.pacscript
index c47fcb4ce0..b87c5415fa 100644
--- a/packages/pacget-git/pacget-git.pacscript
+++ b/packages/pacget-git/pacget-git.pacscript
@@ -17,7 +17,4 @@ package() {
   install -Dm755 "pacget" "${pkgdir}/usr/bin/pacget"
 }
 
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${gives}"
-}
 # vim:set ft=sh ts=4 sw=4 noet:
diff --git a/packages/pipes.sh-bin/pipes.sh-bin.pacscript b/packages/pipes.sh-bin/pipes.sh-bin.pacscript
index 4b845a3960..7aaef8f4c5 100644
--- a/packages/pipes.sh-bin/pipes.sh-bin.pacscript
+++ b/packages/pipes.sh-bin/pipes.sh-bin.pacscript
@@ -18,9 +18,4 @@ package() {
   make DESTDIR="${pkgdir}" PREFIX=/usr install
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/qogir-icon-theme-bin/qogir-icon-theme-bin.pacscript b/packages/qogir-icon-theme-bin/qogir-icon-theme-bin.pacscript
index cd7ddacdf8..715686091e 100644
--- a/packages/qogir-icon-theme-bin/qogir-icon-theme-bin.pacscript
+++ b/packages/qogir-icon-theme-bin/qogir-icon-theme-bin.pacscript
@@ -28,9 +28,4 @@ package() {
   ./install.sh -d "${pkgdir}/usr/share/icons"
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/smartgit/smartgit.pacscript b/packages/smartgit/smartgit.pacscript
index b463527650..f6ad7e7d6c 100644
--- a/packages/smartgit/smartgit.pacscript
+++ b/packages/smartgit/smartgit.pacscript
@@ -4,7 +4,6 @@ source=("https://www.syntevo.com/downloads/smartgit/smartgit-linux-${pkgver//./_
 depends=("git" "libgtk-3-0" "libcurl4")
 pkgdesc="Graphical Git client with support for GitHub, Bitbucket and GitLab"
 # the source for this pacscript uses dynamic hashing, so we have to ignore it
-# hash="138cd50d6afd604de39ed907a20d3e63ac551c9cf643c0262d60f1b84abeec81"
 maintainer=("echometerain <echometer@disroot.org>")
 repology=("project: smartgit")
 
diff --git a/packages/soundux/soundux.pacscript b/packages/soundux/soundux.pacscript
index c5f96484e8..e41ea72acc 100644
--- a/packages/soundux/soundux.pacscript
+++ b/packages/soundux/soundux.pacscript
@@ -27,8 +27,3 @@ package() {
   # install license
   install -Dm 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "../LICENSE"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/doc/${pkgname}"
-  sudo rm -rf "/usr/share/licenses/${pkgname}"
-}
diff --git a/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript b/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript
index 439dac4aaa..8fcba52523 100644
--- a/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript
+++ b/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript
@@ -69,8 +69,4 @@ END
   install -Dm644 "${srcdir}/${gives}.desktop" -t "${pkgdir}/usr/share/applications"
 }
 
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${gives}"
-}
-
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/surf/surf.pacscript b/packages/surf/surf.pacscript
index 73c139074e..54cfb53535 100644
--- a/packages/surf/surf.pacscript
+++ b/packages/surf/surf.pacscript
@@ -20,8 +20,3 @@ package() {
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
   install -Dm644 README -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/licenses/${pkgname}"
-  sudo rm -rf "/usr/share/doc/${pkgname}"
-}
diff --git a/packages/taskwarrior/taskwarrior.pacscript b/packages/taskwarrior/taskwarrior.pacscript
index b39f45cc32..933c86b778 100644
--- a/packages/taskwarrior/taskwarrior.pacscript
+++ b/packages/taskwarrior/taskwarrior.pacscript
@@ -33,15 +33,3 @@ package() {
 
   install -Dm644 "../LICENSE" "${pkgdir}/usr/share/licenses/task/LICENSE"
 }
-
-post_remove() {
-  sudo rm -rf "/usr/share/bash-completion/completions/task"
-  sudo rm -rf "/usr/share/fish/vendor_completions.d/task.fish"
-
-  sudo rm -rf "/usr/share/vim/vimfiles/ftdetect/task.vim"
-  sudo rm -rf "/usr/share/vim/vimfiles/syntax/taskdata.vim"
-  sudo rm -rf "/usr/share/vim/vimfiles/syntax/taskedit.vim"
-  sudo rm -rf "/usr/share/vim/vimfiles/syntax/taskrc.vim"
-
-  sudo rm -rf "/usr/share/licenses/task/LICENSE"
-}
diff --git a/packages/timeshift/timeshift.pacscript b/packages/timeshift/timeshift.pacscript
index b5e16b6e81..db463fd91d 100644
--- a/packages/timeshift/timeshift.pacscript
+++ b/packages/timeshift/timeshift.pacscript
@@ -20,9 +20,8 @@ build() {
 package() {
   cd "${_archive}"
   DESTDIR="${pkgdir}" ninja -C build install
-}
-
-# FIX: workaround broken pkexec usage from upstream
-post_install() {
-  sudo sed -i 's/pkexec \${app/pkexec env DISPLAY=\$DISPLAY XAUTHORITY=\$XAUTHORITY \${app/g' /usr/local/bin/timeshift-launcher
+  # FIX: workaround broken pkexec usage from upstream
+  #
+  # shellcheck disable=2016
+  sed -i 's/pkexec \${app/pkexec env DISPLAY=\$DISPLAY XAUTHORITY=\$XAUTHORITY \${app/g' "${pkgdir}/usr/local/bin/timeshift-launcher"
 }
diff --git a/packages/tmpmail-bin/tmpmail-bin.pacscript b/packages/tmpmail-bin/tmpmail-bin.pacscript
index dd12233787..243e68ca15 100644
--- a/packages/tmpmail-bin/tmpmail-bin.pacscript
+++ b/packages/tmpmail-bin/tmpmail-bin.pacscript
@@ -31,9 +31,4 @@ package() {
   install -Dm755 "tmpmail" -t "${pkgdir}/usr/bin"
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${gives}"
-  sudo rm -rf "/usr/share/doc/${gives}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/topgrade-bin/.SRCINFO b/packages/topgrade-bin/.SRCINFO
index aea6cc77cf..38662166bc 100644
--- a/packages/topgrade-bin/.SRCINFO
+++ b/packages/topgrade-bin/.SRCINFO
@@ -4,11 +4,12 @@ pkgver = 13.0.0
 pkgdesc = Upgrades everything on your system
 arch = amd64
 arch = arm64
-source = https://github.com/topgrade-rs/topgrade/releases/download/v13.0.0/topgrade-v13.0.0-aarch64-unknown-linux-gnu.tar.gz
 breaks = topgrade
 breaks = topgrade-deb
 breaks = topgrade-app
 breaks = topgrade-git
 breaks = topgrade-musl-bin
+source_amd64 = https://github.com/topgrade-rs/topgrade/releases/download/v13.0.0/topgrade-v13.0.0-x86_64-unknown-linux-gnu.tar.gz
+source_arm64 = https://github.com/topgrade-rs/topgrade/releases/download/v13.0.0/topgrade-v13.0.0-aarch64-unknown-linux-gnu.tar.gz
 sha256sums_amd64 = b9bbab3a2cbea68bd3476ae858a00f74a57e6224a7fbef0ed0de5273ac95affd
 sha256sums_arm64 = 5079a1f50f2fd2d7954639f5eb14db38094f78493e2292a945f9f5ac60bfff5d
diff --git a/packages/topgrade-bin/topgrade-bin.pacscript b/packages/topgrade-bin/topgrade-bin.pacscript
index 1d1988752d..bb48246da1 100644
--- a/packages/topgrade-bin/topgrade-bin.pacscript
+++ b/packages/topgrade-bin/topgrade-bin.pacscript
@@ -4,12 +4,8 @@ pkgver="13.0.0"
 arch=('amd64' 'arm64')
 sha256sums_amd64=("b9bbab3a2cbea68bd3476ae858a00f74a57e6224a7fbef0ed0de5273ac95affd")
 sha256sums_arm64=("5079a1f50f2fd2d7954639f5eb14db38094f78493e2292a945f9f5ac60bfff5d")
-if [[ ${CARCH} == amd64 ]]; then
-  arch_prefix="x86_64"
-else
-  arch_prefix="aarch64"
-fi
-source=("https://github.com/topgrade-rs/topgrade/releases/download/v${pkgver}/topgrade-v${pkgver}-${arch_prefix}-unknown-linux-gnu.tar.gz")
+source_amd64=("https://github.com/topgrade-rs/topgrade/releases/download/v${pkgver}/topgrade-v${pkgver}-x86_64-unknown-linux-gnu.tar.gz")
+source_arm64=("https://github.com/topgrade-rs/topgrade/releases/download/v${pkgver}/topgrade-v${pkgver}-aarch64-unknown-linux-gnu.tar.gz")
 pkgdesc="Upgrades everything on your system"
 breaks=("${gives}" "${gives}-deb" "${gives}-app" "${gives}-git" "${gives}-musl-bin")
 repology=("project: ${gives}")
diff --git a/packages/uwufetch/uwufetch.pacscript b/packages/uwufetch/uwufetch.pacscript
index 57825babee..13bae63e39 100644
--- a/packages/uwufetch/uwufetch.pacscript
+++ b/packages/uwufetch/uwufetch.pacscript
@@ -43,9 +43,4 @@ package() {
   make install DESTDIR="${pkgdir}"
 }
 
-post_remove() {
-  # Remove empty directories
-  sudo rm -rf "/usr/share/licenses/${pkgname}"
-  sudo rm -rf "/usr/share/doc/${pkgname}"
-}
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/watchexec-bin/.SRCINFO b/packages/watchexec-bin/.SRCINFO
index ca461d9b25..5ee7160957 100644
--- a/packages/watchexec-bin/.SRCINFO
+++ b/packages/watchexec-bin/.SRCINFO
@@ -3,6 +3,7 @@ pkgver = 1.25.1
 pkgdesc = Executes commands in response to file modifications
 arch = amd64
 arch = arm64
-source = https://github.com/watchexec/watchexec/releases/download/v1.25.1/watchexec-1.25.1-aarch64-unknown-linux-gnu.tar.xz
+source_amd64 = https://github.com/watchexec/watchexec/releases/download/v1.25.1/watchexec-1.25.1-x86_64-unknown-linux-gnu.tar.xz
+source_arm64 = https://github.com/watchexec/watchexec/releases/download/v1.25.1/watchexec-1.25.1-aarch64-unknown-linux-gnu.tar.xz
 sha256sums_amd64 = 16c92ce0b13f4b0082b8a8362ac099fa5ae417780255990302e4865c2a8cd1bc
 sha256sums_arm64 = a8ccd6770d0c0cceace33e5c668f236aaa5292bf77711a6afaefceb0bf8b87c7
diff --git a/packages/watchexec-bin/watchexec-bin.pacscript b/packages/watchexec-bin/watchexec-bin.pacscript
index 6cac8a45c1..4b3212e982 100644
--- a/packages/watchexec-bin/watchexec-bin.pacscript
+++ b/packages/watchexec-bin/watchexec-bin.pacscript
@@ -4,12 +4,8 @@ pkgver="1.25.1"
 arch=('amd64' 'arm64')
 sha256sums_amd64=("16c92ce0b13f4b0082b8a8362ac099fa5ae417780255990302e4865c2a8cd1bc")
 sha256sums_arm64=("a8ccd6770d0c0cceace33e5c668f236aaa5292bf77711a6afaefceb0bf8b87c7")
-if [[ ${CARCH} == amd64 ]]; then
-    arch_prefix="x86_64"
-else
-    arch_prefix="aarch64"
-fi
-source=("https://github.com/watchexec/watchexec/releases/download/v${pkgver}/watchexec-${pkgver}-${arch_prefix}-unknown-linux-gnu.tar.xz")
+source_amd64=("https://github.com/watchexec/watchexec/releases/download/v${pkgver}/watchexec-${pkgver}-x86_64-unknown-linux-gnu.tar.xz")
+source_arm64=("https://github.com/watchexec/watchexec/releases/download/v${pkgver}/watchexec-${pkgver}-aarch64-unknown-linux-gnu.tar.xz")
 pkgdesc="Executes commands in response to file modifications"
 homepage='https://watchexec.github.io/'
 maintainer=("Andrew Barchuk <andrew@raindev.io>")
diff --git a/packages/wezterm-bin/wezterm-bin.pacscript b/packages/wezterm-bin/wezterm-bin.pacscript
index 9686a4520e..6c45412fb1 100644
--- a/packages/wezterm-bin/wezterm-bin.pacscript
+++ b/packages/wezterm-bin/wezterm-bin.pacscript
@@ -33,14 +33,6 @@ post_install() {
 }
 
 post_remove() {
-  # Remove additional files
-  sudo rm -f "/usr/share/bash-completions/wezterm"
-  sudo rm -f "/usr/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png"
-  sudo rm -f "/usr/share/metainfo/org.wezfurlong.wezterm.appdata.xml"
-  sudo rm -f "/usr/share/nautilus-python/extensions/wezterm-nautilus.py"
-  sudo rm -rf "/usr/share/wezterm/"
-  sudo rm -f "/usr/share/zsh/functions/Completion/Unix/_wezterm"
-
   # Delete wezterm config
   if ask "Do you want to delete wezterm config files?" N; then
     rm -rf "${homedir}/.config/.wezterm/"
diff --git a/packages/zig-bin/.SRCINFO b/packages/zig-bin/.SRCINFO
index aaa29d9218..b8e7748b8f 100644
--- a/packages/zig-bin/.SRCINFO
+++ b/packages/zig-bin/.SRCINFO
@@ -3,6 +3,7 @@ pkgver = 0.11.0
 pkgdesc = General-purpose programming language and toolchain for maintaining robust, optimal and reusable software
 arch = amd64
 arch = arm64
-source = https://ziglang.org/download/0.11.0/zig-linux-aarch64-0.11.0.tar.xz
+source_amd64 = https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz
+source_arm64 = https://ziglang.org/download/0.11.0/zig-linux-aarch64-0.11.0.tar.xz
 sha256sums_amd64 = 2d00e789fec4f71790a6e7bf83ff91d564943c5ee843c5fd966efc474b423047
 sha256sums_arm64 = 956eb095d8ba44ac6ebd27f7c9956e47d92937c103bf754745d0a39cdaa5d4c6
diff --git a/packages/zig-bin/zig-bin.pacscript b/packages/zig-bin/zig-bin.pacscript
index 1c324519fe..4f91ca8efe 100644
--- a/packages/zig-bin/zig-bin.pacscript
+++ b/packages/zig-bin/zig-bin.pacscript
@@ -4,12 +4,8 @@ pkgver="0.11.0"
 arch=('amd64' 'arm64')
 sha256sums_amd64=("2d00e789fec4f71790a6e7bf83ff91d564943c5ee843c5fd966efc474b423047")
 sha256sums_arm64=("956eb095d8ba44ac6ebd27f7c9956e47d92937c103bf754745d0a39cdaa5d4c6")
-if [[ ${CARCH} == amd64 ]]; then
-    url_arch="x86_64"
-else
-    url_arch="aarch64"
-fi
-source=("https://ziglang.org/download/${pkgver}/zig-linux-${url_arch}-${pkgver}.tar.xz")
+source_amd64=("https://ziglang.org/download/${pkgver}/zig-linux-x86_64-${pkgver}.tar.xz")
+source_arm64=("https://ziglang.org/download/${pkgver}/zig-linux-aarch64-${pkgver}.tar.xz")
 pkgdesc="General-purpose programming language and toolchain for maintaining robust, optimal and reusable software"
 homepage='https://ziglang.org/'
 maintainer=("Andrew Barchuk <andrew@raindev.io>")