sporada/lug-helper
1
0
Fork 0
mirror of https://github.com/the-sane/lug-helper.git synced 2024-09-21 17:32:53 +00:00
Code Issues Projects Releases Wiki Activity

Improve try_exec error handling

Browse Source
This commit is contained in:
the-sane 2023-01-20 19:26:25 -05:00
parent 394cfa9392
commit b009265951
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lug-helper.sh
View File

@ -233,7 +233,7 @@ debug_print() {
# Try to execute a supplied command as root # Try to execute a supplied command as root
# Expects one string argument # Expects one string argument
try_exec() { try_exec() {
# This function expects one string arguments # This function expects one string argument
if [ "$#" -lt 1 ]; then if [ "$#" -lt 1 ]; then
printf "\nScript error: The try_exec() function expects an argument. Aborting.\n" printf "\nScript error: The try_exec() function expects an argument. Aborting.\n"
read -n 1 -s -p "Press any key..." read -n 1 -s -p "Press any key..."
@ -251,15 +251,19 @@ try_exec() {
# User cancel or error # User cancel or error
retval=1 retval=1
fi fi
else elif [ -x "$(command -v sudo)" ]; then
sudo sh -c "$1" sudo sh -c "$1"
# Check the exit status # Check the exit status
statuscode="$?" statuscode="$?"
if [ "$statuscode" -eq 1 ] || [ "$statuscode" -eq 127 ]; then if [ "$statuscode" -eq 1 ]; then
# 1=sudo or sh error. 127=command not found # Error
retval=1 retval=1
fi fi
else
# We don't know how to perform this operation with elevated privileges
printf "\nNeither Polkit nor sudo appear to be installed. Unable to execute the command with elevated privileges.\n"
retval=1
fi fi
return "$retval" return "$retval"