From 49b2b72cd89ace09268fad1f54687bbb4c8f9bee Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Tue, 6 Jul 2021 20:53:54 +0300
Subject: [PATCH] kiss: use pkg_order for all applicable actions

---
 kiss | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/kiss b/kiss
index 6e8bea7..3248caa 100755
--- a/kiss
+++ b/kiss
@@ -658,12 +658,6 @@ pkg_tar() (
 pkg_build() {
     # Build packages and turn them into packaged tarballs.
     # Order the argument list and filter out duplicates.
-    pkg_order "$@"
-
-    # Intentional, globbing disabled.
-    # shellcheck disable=2046,2086
-    set -- $order
-
     log "Resolving dependencies"
 
     # Mark packages passed on the command-line separately from those
@@ -1489,7 +1483,12 @@ pkg_updates() {
         *)
             log "Packages to update: $*"
             pkg_update=1
-            pkg_build "$@"
+            pkg_order "$@"
+
+            # Intentional, globbing disabled.
+            # shellcheck disable=2046,2086
+            pkg_build $order
+
             log "Updated all packages"
         ;;
     esac
@@ -1527,10 +1526,21 @@ args() {
                 ;;
 
                 [!l]-)
-                    # Use basename of current directory as package.
+                    # Add parent directory to repository list.
                     export KISS_PATH=${PWD%/*}:$KISS_PATH
+
+                    # Use basename of current directory as package.
                     set -- "${PWD##*/}"
                 ;;
+
+                [!l]-*)
+                    # Order the argument list based on dependence.
+                    pkg_order "$@"
+
+                    # Intentional, globbing disabled.
+                    # shellcheck disable=2046,2086
+                    set -- $order
+                ;;
             esac
         ;;
     esac
@@ -1599,10 +1609,8 @@ args() {
         ;;
 
         i|install|r|remove)
-            pkg_order "$@"
-
             case $action in
-                i*) for pkg in $order; do pkg_install "$pkg"; done ;;
+                i*) for pkg do pkg_install "$pkg"; done ;;
                 r*) for pkg in $redro; do pkg_remove  "$pkg"; done
             esac
         ;;