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

kiss: Fix gpg error with su.

Browse Source
This commit is contained in:
Dylan Araps 2020-02-24 22:48:29 +02:00
parent 4dd9c4e5a7
commit 07bbe7c59a
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiss
View File

@ -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