bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: Fix update bug

Browse Source
This commit is contained in:
Dylan Araps 2020-01-30 14:32:57 +02:00
parent b79805e48a
commit ca26070683
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kiss
View File

@ -49,16 +49,23 @@ prompt() {
} }
as_root() { 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 ] || { [ "$(id -u)" = 0 ] || {
log "Using '${su:-su}'" 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 case $su in
*sudo) sudo -E sh -c "$*" ;; *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 ;; *) su -pc "$* <&3" 3<&0 </dev/tty ;;
esac 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) v|version|-v|--version)
log kiss 1.1.3 log kiss 1.1.4
;; ;;
h|help|-h|--help|'') h|help|-h|--help|'')