From d90ca4b1ad18289d6bcfcef51cfb032a0b4423eb Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@riseup.net>
Date: Tue, 14 Jan 2020 15:12:13 -0500
Subject: [PATCH] refactoring

---
 usr/bin/pkexec.security-misc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/usr/bin/pkexec.security-misc b/usr/bin/pkexec.security-misc
index 0a1ac9a..6a718ab 100755
--- a/usr/bin/pkexec.security-misc
+++ b/usr/bin/pkexec.security-misc
@@ -79,16 +79,17 @@ if [[ "$@" = "" ]]; then
    exit $?
 fi
 
-## set PATH same as root
-## This is required for gdebi.
-## REVIEW: is it ok that users can find out the PATH setting of root?
-PATH="$(sudo --non-interactive /usr/lib/security-misc/echo-path)"
-export PATH
-
 exit_code=0
 if [ "$use_sudo" = "true" ]; then
+   ## 'sudo --user user' environment variables such as PATH.
    lxqt-sudo sudo --user "$user_pkexec_wrapper" --set-home "$@" || { exit_code=$? ; true; };
 else
+   ## set PATH same as root
+   ## This is required for gdebi.
+   ## REVIEW: is it ok that users can find out the PATH setting of root?
+   ## lxqt-sudo does not clear environment variables such as PATH.
+   PATH="$(sudo --non-interactive /usr/lib/security-misc/echo-path)"
+   export PATH
    lxqt-sudo "$@" || { exit_code=$? ; true; };
 fi