cpt

[ARCHIVED] Carbs Packaging Tools
git clone git://git.ckyln.com/~cem/cpt.git
Log | Files | Refs | README | LICENSE

commit ca2607068357cfc55be576fcf126d36727f2ea4f
parent b79805e48ae8f015f97a1edad842366350fe0587
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Thu, 30 Jan 2020 14:32:57 +0200

kiss: Fix update bug

Diffstat:
Mkiss | 13++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/kiss b/kiss @@ -49,16 +49,23 @@ prompt() { } as_root() { + # Simple function to run a command as root using either 'sudo', + # 'doas' or 'su'. This also handles KISS' environment variables. [ "$(id -u)" = 0 ] || { 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 "HOME='$HOME' KISS_PATH='$KISS_PATH' $*" ;; + *doas) doas -- sh -c "$env $*" ;; *) su -pc "$* <&3" 3<&0 </dev/tty ;; esac - exit + # Only exit here if we're spawning a second 'kiss' instance. + [ "$1" != kiss ] || exit } } @@ -1255,7 +1262,7 @@ args() { ;; v|version|-v|--version) - log kiss 1.1.3 + log kiss 1.1.4 ;; h|help|-h|--help|'')