Skip to content

Make func_lib_check_sudo() a warning cause sudo() message is better #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiulipan merged 1 commit into from
Sep 17, 2020
Merged

Make func_lib_check_sudo() a warning cause sudo() message is better #369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions case-lib/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,19 @@ func_lib_start_log_collect()
sudo "$loggerBin $logopt -l $ldcFile -o $logfile" 2>/dev/null &
}

# Calling this function is often a mistake because the error message
# from the actual sudo() function in hijack.sh is better: it is
# guaranteed to print the command that needs sudo and give more
# information. func_lib_check_sudo() is useful only when sudo is
# optional and when its warning can be ignored (with '|| true') but in
# the past it has been used to abort the test immediately and lose the
# better error message from sudo().
func_lib_check_sudo()
{
local cmd="${1:-Unknown command}"
func_hijack_setup_sudo_level || {
dlogw "Command needs root privilege to run, please configure SUDO_PASSWD in case-lib/config.sh"
exit 2
dlogw "$cmd needs root privilege to run, please use NOPASSWD or cached credentials"
return 2
}
}

Expand All @@ -130,7 +138,7 @@ func_lib_disable_pulseaudio()
# store current pulseaudio command
readarray -t PULSECMD_LST < <(ps -C pulseaudio -o user,cmd --no-header)
[[ "${#PULSECMD_LST[@]}" -eq 0 ]] && return
func_lib_check_sudo
func_lib_check_sudo 'disabling pulseaudio'
# get all running pulseaudio paths
readarray -t PULSE_PATHS < <(ps -C pulseaudio -o cmd --no-header | awk '{print $1}'|sort -u)
for PA_PATH in "${PULSE_PATHS[@]}"
Expand All @@ -153,7 +161,7 @@ func_lib_disable_pulseaudio()
func_lib_restore_pulseaudio()
{
[[ "${#PULSECMD_LST[@]}" -eq 0 ]] && return
func_lib_check_sudo
func_lib_check_sudo 're-enabling pulseaudio'
# restore pulseaudio
for PA_PATH in "${PULSE_PATHS[@]}"
do
Expand Down