From 8243b4ff11960e4ef79cb31bd55983d031fcd862 Mon Sep 17 00:00:00 2001
From: "dylan.araps@gmail.com" <dylan.araps@gmail.com>
Date: Mon, 27 Jan 2020 09:10:52 +0000
Subject: kiss: fix args i issues

FossilOrigin-Name: 3b8bd0855f52c6e130f615f9b66b728999496c6cfa7f177547688f275fca0fd3
---
 kiss | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/kiss b/kiss
index 47744b7..731f6e1 100755
--- a/kiss
+++ b/kiss
@@ -65,6 +65,8 @@ root_cache() {
 }
 
 dosu() {
+    [ "$pass" ] || root_cache
+
     # Run a command as root using the cached password. The 'su'
     # command allows you to input a password via stdin. To hide
     # the prompt, the command's output is sent to '/dev/tty'
@@ -494,7 +496,9 @@ pkg_build() {
             # to 'su' to elevate permissions.
             [ -f "$bin_dir/$pkg#$version-$release.tar.gz" ] && {
                 log "$pkg" "Found pre-built binary, installing"
-                (KISS_FORCE=1 args i "$bin_dir/$pkg#$version-$release.tar.gz")
+
+                dosu KISS_FORCE=1 \
+                    kiss i "$bin_dir/$pkg#$version-$release.tar.gz" ||:
 
                 # Remove the now installed package from the build
                 # list. No better way than using 'sed' in POSIX 'sh'.
@@ -581,7 +585,8 @@ pkg_build() {
         contains "$explicit" "$pkg" && [ -z "$pkg_update" ] && continue
 
         log "$pkg" "Needed as a dependency or has an update, installing"
-        (KISS_FORCE=1 args i "$pkg")
+
+        dosu KISS_FORCE=1 kiss i "$bin_dir/$pkg#$version-$release.tar.gz" ||:
     done
 
     # End here as this was a system update and all packages have been installed.
@@ -599,7 +604,7 @@ pkg_build() {
         log "Install built packages? [$*]"
 
         prompt && {
-            args i "$@"
+            dosu kiss i "$@" ||:
             return
         }
     }
@@ -941,7 +946,7 @@ pkg_updates() {
         prompt
 
         pkg_build kiss
-        args i kiss
+        dosu kiss i kiss ||:
 
         log "Updated the package manager"
         log "Re-run 'kiss update' to update your system"
@@ -974,6 +979,8 @@ pkg_updates() {
 pkg_clean() {
     # Clean up on exit or error. This removes everything related
     # to the build.
+    stty echo 2>/dev/null
+
     [ "$KISS_DEBUG" != 1 ] || return
 
     # Block 'Ctrl+C' while cache is being cleaned.
-- 
cgit v1.2.3