From e965518dc7df1a1363be674455bb798b28727851 Mon Sep 17 00:00:00 2001 From: Stanislas Lange Date: Wed, 10 Mar 2021 22:16:16 +0100 Subject: [PATCH] Fix home dir detection when using sudo as root Close https://github.com/angristan/openvpn-install/issues/780 --- openvpn-install.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index d479cfd..2bcf579 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -1084,12 +1084,20 @@ function newClient() { echo "Client $CLIENT added." fi - # Home directory of the user, where the client configuration (.ovpn) will be written - if [ -e "/home/$CLIENT" ]; then # if $1 is a user name - homeDir="/home/$CLIENT" - elif [ "${SUDO_USER}" ]; then # if not, use SUDO_USER - homeDir="/home/${SUDO_USER}" - else # if not SUDO_USER, use /root + # Home directory of the user, where the client configuration will be written + if [ -e "/home/${CLIENT_NAME}" ]; then + # if $1 is a user name + homeDir="/home/${CLIENT_NAME}" + elif [ "${SUDO_USER}" ]; then + # if not, use SUDO_USER + if [ "${SUDO_USER}" == "root" ]; then + # If running sudo as root + homeDir="/root" + else + homeDir="/home/${SUDO_USER}" + fi + else + # if not SUDO_USER, use /root homeDir="/root" fi