--uninstall undoes what punktfunk-omarchy setup did, and the detection matrix grows an Omarchy row #434

Merged
enricobuehler merged 1 commits from worktree-omarchy-installer-gaps into main 2026-08-28 21:45:57 +00:00
2 changed files with 13 additions and 0 deletions
+6
View File
@@ -147,6 +147,11 @@ installer_case fedora 'ID=fedora\nVERSION_ID=44\n' 'sudo dn
installer_case fedora43 'ID=fedora\nVERSION_ID=43\n' '/rpm/bazzite'
installer_case arch 'ID=arch\n' 'sudo pacman -Syu --noconfirm punktfunk-host punktfunk-web punktfunk-scripting'
installer_case cachyos 'ID=cachyos\nID_LIKE="arch"\n' 'sudo pacman -Syu --noconfirm punktfunk-host punktfunk-web punktfunk-scripting'
# Omarchy: arch family, but its libalpm guard kills any -S+-u transaction, so the install must
# split into -Sy then -S (and --yes still has to reach that -S), and the run must hand off to
# `punktfunk-omarchy setup` rather than do a second, weaker version of the same wiring.
installer_case omarchy 'ID=omarchy\nID_LIKE=arch\nVERSION_ID=4.0.1\n' 'sudo pacman -S --noconfirm punktfunk-host punktfunk-web punktfunk-scripting'
installer_case omarchy2 'ID=omarchy\nID_LIKE=arch\nVERSION_ID=4.0.1\n' 'punktfunk-omarchy setup'
installer_case bazzite 'ID=bazzite\nID_LIKE="fedora"\nVERSION_ID=43\n' 'punktfunk-sysext.sh install'
installer_case nixos 'ID=nixos\n' 'docs/nixos'
installer_case steamos 'ID=steamos\nID_LIKE=arch\n' 'docs/steamos-host'
@@ -154,6 +159,7 @@ installer_case gentoo 'ID=gentoo\n' 'build-fr
installer_case debian-rm 'ID=debian\nVERSION_ID=13\n' 'sources.list.d/punktfunk.list' --uninstall
installer_case fedora-rm 'ID=fedora\nVERSION_ID=44\n' 'yum.repos.d/punktfunk.repo' --uninstall
installer_case arch-rm 'ID=arch\n' '/etc/pacman.conf' --uninstall
installer_case omarchy-rm 'ID=omarchy\nID_LIKE=arch\n' 'punktfunk-omarchy remove' --uninstall
installer_case bazzite-rm 'ID=bazzite\nID_LIKE="fedora"\nVERSION_ID=43\n' 'punktfunk-sysext remove' --uninstall
# ---------------------------------------------------------------- gate 8: channel switching
+7
View File
@@ -254,6 +254,13 @@ if [ "$UNINSTALL" = 1 ]; then
run 'sudo rm -f /etc/yum.repos.d/punktfunk.repo'
;;
pacman)
# `punktfunk-omarchy setup` put wiring OUTSIDE the packages — ufw rules, a user-unit
# drop-in, an app-menu entry, hooks.json, a picker takeover in xdph.conf. Its own
# `remove` is the reverse, and it ships IN the host package, so it has to run before
# pacman takes it away. It is idempotent: safe when setup never ran.
if [ "$ID" = omarchy ] && { command -v punktfunk-omarchy >/dev/null 2>&1 || [ "$DRY" = 1 ]; }; then
run 'punktfunk-omarchy remove'
fi
pkgs=$(installed_pf)
[ -n "$pkgs" ] && run "sudo pacman -Rns $pkgs"
run "$PACMAN_RM_REPO"