From 0dbb5748ff9208dc225e9822f7aa044643e6912b Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 4 Jun 2020 14:10:16 -0400 Subject: [PATCH] revised sudo implementation to fix centos --- scripts/core/functions.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 44f6155d..d392c234 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -439,7 +439,10 @@ if [ -z "$skip_all" ]; then # launch sudo with just the variables we want to reach the other side. # we take an extra step to null out the PATH, since MacOS seems to want # to pass that even for a login shell (-i) somehow. - PATH= /usr/bin/sudo --preserve-env=SSH_AUTH_SOCK,IMPORTED_XAUTH "$@" + local varmods="PATH= " + if [ ! -z "$IMPORTED_XAUTH" ]; then varmods+="IMPORTED_XAUTH=$IMPORTED_XAUTH "; fi + if [ ! -z "$SSH_AUTH_SOCK" ]; then varmods+="SSH_AUTH_SOCK=$SSH_AUTH_SOCK"; fi + /usr/bin/sudo $varmods "$@" retval=$? # take the xauth info away again if it wasn't set already. -- 2.34.1