cpt

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

commit 07bbe7c59a6f922cfeaaa30117e51dbd4d9b26a0
parent 4dd9c4e5a729d1aad3f2b208b59d63ddb7f8cd4d
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Mon, 24 Feb 2020 22:48:29 +0200

kiss: Fix gpg error with su.

Diffstat:
Mkiss | 14+++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kiss b/kiss @@ -56,9 +56,9 @@ as_root() { [ "$uid" = 0 ] || log "Using '${su:-su}'" case $su in - *sudo) sudo -Eu "${user:-root}" -- "$@" ;; - *doas) doas -u "${user:-root}" -- "$@" ;; - *) su -pc "$* <&3" "${user:-root}" 3<&0 </dev/tty ;; + *sudo) sudo -E -- "$@" ;; + *doas) doas -- "$@" ;; + *) su -pc "$* <&3" 3<&0 </dev/tty ;; esac } @@ -1108,14 +1108,14 @@ pkg_updates() { ( user=$(stat -c %U "$PWD") - [ "$user" = root ] || + [ "${user:=root}" = root ] || log "Dropping permissions to $user for pull" case $su in - su) as_root "git fetch && git merge" ;; + su) "$su" -c "git fetch && git merge" "$user" ;; - *) "$su" git fetch - "$su" git merge + *) "$su" -u "$user" git fetch + "$su" -u "$user" git merge esac ) fi