Makefile

@@ -15,10 +15,10 @@ do_cleanup: cleanup_files
 do_cleanup: list_packages
 
 download:
-	bash -ec "eval $$(vault2env --key secret/minio/archrepo --export) && s3sync --delete s3://archrepo/x86_64/ $(REPO_DIR)/"
+	vault2env --key secret/minio/archrepo -- s3sync --delete s3://archrepo/x86_64/ $(REPO_DIR)/
 
 upload: cleanup_files check_archive_mix
-	bash -ec "eval $$(vault2env --key secret/minio/archrepo --export) && s3sync --delete $(REPO_DIR)/ s3://archrepo/x86_64/"
+	vault2env --key secret/minio/archrepo -- s3sync --delete $(REPO_DIR)/ s3://archrepo/x86_64/
 
 # Maintenance targets
 

repo-urls

@@ -24,7 +24,6 @@ https://git.luzifer.io/luzifer-arch/obs-studio-browser.git
 https://git.luzifer.io/luzifer-arch/streamdeck.git
 https://git.luzifer.io/luzifer-arch/vault2env.git
 https://git.luzifer.io/luzifer-arch/vault-bin.git
-https://git.luzifer.io/luzifer-arch/vault-user-token.git
 https://git.luzifer.io/luzifer-arch/vercel.git
 https://git.luzifer.io/luzifer-arch/vim-go-tools.git
 
@@ -34,8 +33,6 @@ https://aur.archlinux.org/babel-eslint.git
 https://aur.archlinux.org/cargo-make.git
 https://aur.archlinux.org/cef-minimal.git
 https://aur.archlinux.org/cinny-desktop.git
-https://aur.archlinux.org/cnquery.git
-https://aur.archlinux.org/cnspec.git
 https://aur.archlinux.org/espanso.git
 https://aur.archlinux.org/exa-git.git
 https://aur.archlinux.org/golangci-lint-bin.git
@@ -43,19 +40,13 @@ https://aur.archlinux.org/google-cloud-sdk.git
 https://aur.archlinux.org/gorun.git
 https://aur.archlinux.org/helm-2to3.git
 https://aur.archlinux.org/hfsprogs.git
-https://aur.archlinux.org/hoppscotch-bin.git
 https://aur.archlinux.org/kubelogin.git
 https://aur.archlinux.org/libajantv2.git
-https://aur.archlinux.org/masterpdfeditor-free
-https://aur.archlinux.org/masterpdfeditor
 https://aur.archlinux.org/micronucleus.git
 https://aur.archlinux.org/mozjpeg.git
 https://aur.archlinux.org/mpd-mpris.git
-https://aur.archlinux.org/nvm.git
 https://aur.archlinux.org/obs-cli.git
 https://aur.archlinux.org/oh-my-posh-bin.git
-https://aur.archlinux.org/orca-slicer-bin.git
-https://aur.archlinux.org/packer-plugin-arm-image.git
 https://aur.archlinux.org/pcsc-cyberjack.git
 https://aur.archlinux.org/platformio.git
 https://aur.archlinux.org/python-ajsonrpc.git
@@ -65,12 +56,11 @@ https://aur.archlinux.org/python-vdf.git
 https://aur.archlinux.org/qflipper-git.git
 https://aur.archlinux.org/qrcodegen-cmake.git
 https://aur.archlinux.org/rasdaemon.git
-https://aur.archlinux.org/redisinsight-deb.git
+https://aur.archlinux.org/rdm-bin.git
-#https://aur.archlinux.org/rustdesk.git # Broken as of 2024-04-03
+https://aur.archlinux.org/rustdesk.git
 https://aur.archlinux.org/spotify.git
 https://aur.archlinux.org/thinkfan.git
-https://aur.archlinux.org/ttf-harmonyos-sans.git  # NOTE(kahlers): Dependency of orca-slicer
+https://aur.archlinux.org/ulauncher.git
-#https://aur.archlinux.org/ulauncher.git # Broken as of 2024-04-28 (Py 3.12)
 https://aur.archlinux.org/usbtop.git
 https://aur.archlinux.org/vcpkg.git  # NOTE(kahlers): Dependency of rustdesk
 https://aur.archlinux.org/wrk.git
@@ -82,5 +72,3 @@ https://gist.github.com/dccae45747a1dad41f011a01c75296a3.git
 
 # ttf-windows
 https://gist.github.com/62a861982991afa8843b8922cb40abfc.git
-
-# vim: set ft=conf :

scripts/do_cleanup.sh

@@ -2,12 +2,9 @@
 set -euo pipefail
 
 function log() {
-  echo "[$(date +%H:%M:%S)] $@" >&2
+	echo "[$(date +%H:%M:%S)] $@" >&2
 }
 
-add_opts=()
-[[ -z ${REPOKEY:-} ]] || add_opts+=(-s --key ${REPOKEY})
-
 syncdir="${REPO_DIR:-$(pwd)}"
 
 log "Cleaning up old package versions..."
@@ -17,12 +14,12 @@ log "Adding remaining packages to database..."
 packages=($(find "${syncdir}" -regextype egrep -regex '^.*\.pkg\.tar(\.xz|\.zst)$' | sort))
 
 if [ "${#packages[@]}" -eq 0 ]; then
-  log "No packages found to add to repo, this looks like an error!"
+	log "No packages found to add to repo, this looks like an error!"
-  exit 1
+	exit 1
 fi
 
 log "Adding packages..."
-repo-add ${add_opts[@]} --new --prevent-downgrade "${DATABASE}" "${packages[@]}"
+repo-add --new --prevent-downgrade "${DATABASE}" "${packages[@]}"
 
 log "All packages added, removing *.old copies..."
 find "${syncdir}" -name '*.old' -delete