kiss: Fix gpg error with su.
This commit is contained in:
parent
4dd9c4e5a7
commit
07bbe7c59a
14
kiss
14
kiss
|
@ -56,9 +56,9 @@ as_root() {
|
||||||
[ "$uid" = 0 ] || log "Using '${su:-su}'"
|
[ "$uid" = 0 ] || log "Using '${su:-su}'"
|
||||||
|
|
||||||
case $su in
|
case $su in
|
||||||
*sudo) sudo -Eu "${user:-root}" -- "$@" ;;
|
*sudo) sudo -E -- "$@" ;;
|
||||||
*doas) doas -u "${user:-root}" -- "$@" ;;
|
*doas) doas -- "$@" ;;
|
||||||
*) su -pc "$* <&3" "${user:-root}" 3<&0 </dev/tty ;;
|
*) su -pc "$* <&3" 3<&0 </dev/tty ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1108,14 +1108,14 @@ pkg_updates() {
|
||||||
(
|
(
|
||||||
user=$(stat -c %U "$PWD")
|
user=$(stat -c %U "$PWD")
|
||||||
|
|
||||||
[ "$user" = root ] ||
|
[ "${user:=root}" = root ] ||
|
||||||
log "Dropping permissions to $user for pull"
|
log "Dropping permissions to $user for pull"
|
||||||
|
|
||||||
case $su in
|
case $su in
|
||||||
su) as_root "git fetch && git merge" ;;
|
su) "$su" -c "git fetch && git merge" "$user" ;;
|
||||||
|
|
||||||
*) "$su" git fetch
|
*) "$su" -u "$user" git fetch
|
||||||
"$su" git merge
|
"$su" -u "$user" git merge
|
||||||
esac
|
esac
|
||||||
)
|
)
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue