lug-helper.sh

@@ -233,7 +233,7 @@ debug_print() {
 # Try to execute a supplied command as root
 # Expects one string argument
 try_exec() {
-    # This function expects one string argument
+    # This function expects one string arguments
     if [ "$#" -lt 1 ]; then
         printf "\nScript error:  The try_exec() function expects an argument. Aborting.\n"
         read -n 1 -s -p "Press any key..."
@@ -245,25 +245,19 @@ try_exec() {
     if [ -x "$(command -v pkexec)" ]; then
         pkexec sh -c "$1"
 
-        # Check the exit status
-        statuscode="$?"
-        if [ "$statuscode" -eq 126 ] || [ "$statuscode" -eq 127 ]; then
+        # Check the return value
+        if [ "$?" -eq 126 ] || [ "$?" -eq 127 ]; then
             # User cancel or error
             retval=1
         fi
-    elif [ -x "$(command -v sudo)" ]; then
+    else
         sudo sh -c "$1"
 
-        # Check the exit status
-        statuscode="$?"
-        if [ "$statuscode" -eq 1 ]; then
+        # Check the return value
+        if [ "$?" -eq 1 ]; then
             # Error
             retval=1
         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 the required privileges.\n"
-        retval=1
     fi
 
     return "$retval"
@@ -2080,7 +2074,7 @@ eac_workaround() {
         # Try to modify /etc/hosts as root
         try_exec "printf '\n$eac_hosts #Star Citizen EAC workaround\n' >> /etc/hosts"
         if [ "$?" -eq 1 ]; then
-            message info "Authentication failed or there was an error modifying /etc/hosts.\nSee terminal for more information.\n\nReturning to main menu."
+            message info "Something went wrong. Unable to modify /etc/hosts.\n\nReturning to main menu."
             return 0
         fi