From 26a20c9738712ba6a3df76ac8b65012cc9a0327c Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 30 Jan 2020 15:25:46 +0200
Subject: [PATCH] kiss: Don't spawn sh with sudo/doas

---
 kiss | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/kiss b/kiss
index 7278a83..912135d 100755
--- a/kiss
+++ b/kiss
@@ -53,13 +53,9 @@ as_root() {
     # 'doas' or 'su'. This also handles KISS' environment variables.
     log "Using '${su:-su}'"
 
-    # doas requires these environment variables to be set as they
-    # aren't brought over from the calling user.
-    env="HOME='$HOME' KISS_FORCE='$KISS_FORCE' KISS_PATH='$KISS_PATH'"
-
     case $su in
-        *sudo) sudo -E sh -c "$*" ;;
-        *doas) doas -- sh -c "$env $*" ;;
+        *sudo) sudo -E "$@" ;;
+        *doas) doas -- "$@" ;;
         *)     su -pc "$* <&3" 3<&0 </dev/tty ;;
     esac
 }
@@ -1024,13 +1020,12 @@ pkg_updates() {
             log "$PWD" "$signed "
 
             if [ -w "$PWD" ]; then
-                git fetch
-                git merge
+                git pull
 
             else
                 log "$PWD" "Need root to update"
 
-                as_root 'git fetch && git merge'
+                as_root git pull
             fi
         }
     done
@@ -1264,7 +1259,7 @@ args() {
         ;;
 
         v|version|-v|--version)
-            log kiss 1.1.4
+            log kiss 1.1.5
         ;;
 
         h|help|-h|--help|'')