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

kiss: Allow option of setting sudo command

Browse Source
This commit is contained in:
Dylan Araps 2020-01-30 10:36:08 +02:00
parent 51d9e82230
commit 546110a1c0
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kiss
View File

@ -50,14 +50,13 @@ prompt() {
as_root() { as_root() {
[ "$(id -u)" = 0 ] || { [ "$(id -u)" = 0 ] || {
if command -v sudo >/dev/null; then log "Using '${su:-su}'"
sudo -E KISS_FORCE="$KISS_FORCE" "$@"
elif command -v doas >/dev/null; then case $su in
KISS_FORCE="$KISS_FORCE" doas "$@" *sudo) sudo -E KISS_FORCE="$KISS_FORCE" "$@" ;;
else *doas) KISS_FORCE="$KISS_FORCE" doas "$@" ;;
exec 3<&0 *) su -pc "KISS_FORCE=$KISS_FORCE $* <&3" 3<&0 </dev/tty ;;
su -pc "KISS_FORCE=$KISS_FORCE $* <&3" </dev/tty esac
fi
exit exit
} }
@ -1318,6 +1317,10 @@ main() {
# POSIX correctness. # POSIX correctness.
grep=$(command -v ggrep) || grep='grep' grep=$(command -v ggrep) || grep='grep'
# Figure out which 'sudo' command to use based on the user's choice or
# what is available on the system.
su=${KISS_SU:-$(command -v sudo || command -v doas)} || su=su
# Store the date and time of script invocation to be used as the name # Store the date and time of script invocation to be used as the name
# of the log files the package manager creates uring builds. # of the log files the package manager creates uring builds.
time=$(date '+%d-%m-%Y-%H:%M') time=$(date '+%d-%m-%Y-%H:%M')