From 8caca48504a2647b33df05e5422b9faf2035787e Mon Sep 17 00:00:00 2001
From: Pratham <git-bruh@noreply.codeberg.org>
Date: Sun, 30 Oct 2022 08:51:12 +0100
Subject: [PATCH] kiss: bail out if package removal would break alternatives
 (#89) (#92)

Co-authored-by: git-bruh <e817509a-8ee9-4332-b0ad-3a6bdf9ab63f@aleeas.com>
Reviewed-on: https://codeberg.org/kiss-community/kiss/pulls/92
---
 contrib/kiss-preferred | 12 ------------
 kiss                   | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 13 deletions(-)
 delete mode 100755 contrib/kiss-preferred

diff --git a/contrib/kiss-preferred b/contrib/kiss-preferred
deleted file mode 100755
index 7e8df27..0000000
--- a/contrib/kiss-preferred
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-# Lists the owners of all files with conflicts
-
-kiss a | while read -r _ path; do
-    if owner=$(kiss owns "$path" 2>/dev/null) && [ "$owner" ]; then
-        printf '%s %s\n' "$owner" "$path"
-
-    else
-        printf 'warning: %s has no owner\n' "$path" >&2
-    fi
-done
-
diff --git a/kiss b/kiss
index 0f755b4..d81318f 100755
--- a/kiss
+++ b/kiss
@@ -1325,6 +1325,27 @@ pkg_alternatives() {
     fi
 }
 
+pkg_preferred() {
+    cd "$sys_db"
+
+    # We only respect first argument
+    if ok "$1"; then
+        [ -d "$1" ] || die "'$1' not found"
+        set -- "$1/manifest"
+    else
+        set +f; set -f -- */manifest
+    fi
+
+    # Pass /dev/null to grep to always ensure that the file name
+    # is printed even if we have a single file
+    pkg_alternatives |
+        cut -d' ' -f2- |
+        grep -Fxf - "$@" /dev/null |
+        sed 's/\/manifest:/ /'
+
+    cd "$OLDPWD"
+}
+
 pkg_swap() {
     # Swap between package alternatives.
     [ -d "$sys_db/$1" ] || die "'$1' not found"
@@ -1523,6 +1544,14 @@ pkg_removable() {
 
     set -f
     cd "$OLDPWD"
+
+    # Check if a package would leave dangling "orphaned" alternatives.
+    tmp_file "$1" owned-conflicts
+    pkg_preferred "$1" | tee "$_tmp_file"
+
+    cnt=$(wc -l < "$_tmp_file")
+    equ "$cnt" 0 ||
+        die "$1" "Not removable, package leaves behind $cnt orphaned alternatives"
 }
 
 pkg_remove() {
@@ -1916,7 +1945,7 @@ args() {
     # Ensure that arguments do not contain invalid characters. Wildcards can
     # not be used here as they would conflict with kiss extensions.
     case $action in
-        a|alternatives)
+        a|alternatives|p|preferred)
             case $1 in *\**|*\!*|*\[*|*\ *|*\]*|*/*|*"$newline"*)
                 die "Invalid argument: '!*[ ]/\\n' ($1)"
             esac
@@ -2002,6 +2031,7 @@ args() {
         H|help-ext)     pkg_help_ext "$@" ;;
         i|install)      for pkg do pkg_install "$pkg"; done ;;
         l|list)         pkg_list_version "$@" ;;
+        p|preferred)    pkg_preferred "$@" ;;
         r|remove)       for pkg in $redro; do pkg_remove "$pkg"; done ;;
         s|search)       for pkg do pkg_find "$pkg" all; done ;;
         u|update)       pkg_update ;;