From 01e008a9577155f6b0875b207e42f1c2bbd087f4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 18 Jan 2018 13:46:35 +0100
Subject: Fix UID/USER ambiguity in several places

---
 .../data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/modules/vmware12')

diff --git a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
index 85fafc9f..d7ad77c6 100644
--- a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
+++ b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
@@ -27,7 +27,9 @@ declare -rg VM_CONF_DIR="/tmp/virt/vmware/${USER}.$$"
 declare -rg VM_RUN_FILE="${VM_CONF_DIR}/run-vmware.conf"
 	
 # Users vmware config folder
-[ -z "${HOME}" ] && declare -rg HOME=$(getent passwd "$(whoami)" | awk -F ':' '{print $6}')
+[ -z "$UID" ] && UID=$(id -u)
+[ -z "${HOME}" ] && declare -rg HOME=$(getent passwd "$UID" | awk -F ':' '{print $6}')
+[ -z "${HOME}" ] && slxlog "run-virt-vmware-home" "Could not get home directory of user $(whoami) ($UID)"
 declare -rg VM_HOME="${HOME}/.vmware"
 	
 # mltk generates a vmware config file with several version infos for vmware/player, read it
-- 
cgit v1.2.3-55-g7522