From 4de9403805a09af70f1fb5cdfc564fb888b82cc8 Mon Sep 17 00:00:00 2001
From: weldon <weldon@rewindtech.com>
Date: Thu, 11 Jul 2019 20:55:58 -0600
Subject: [PATCH] eval user homes

Suggest to actually eval the user home path instead of assuming that it is always in /Users. This will almost always be true (that homes are in /Users), but there might be cases where an admin has decided to create a hidden admin home in /var as suggested in Apple Support Article https://support.apple.com/en-us/HT203998
---
 .../jumpcloud_bootstrap_template.sh                | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/zero-touch/prestage_user_enrollment/jumpcloud_bootstrap_template.sh b/zero-touch/prestage_user_enrollment/jumpcloud_bootstrap_template.sh
index 181d66ad2..f745cf043 100644
--- a/zero-touch/prestage_user_enrollment/jumpcloud_bootstrap_template.sh
+++ b/zero-touch/prestage_user_enrollment/jumpcloud_bootstrap_template.sh
@@ -97,7 +97,7 @@ function DEPNotifyReset() {
     ACTIVE_USER=$(/usr/bin/python -c 'from SystemConfiguration import SCDynamicStoreCopyConsoleUser; import sys; username = (SCDynamicStoreCopyConsoleUser(None, None, None) or [None])[0]; username = [username,""][username in [u"loginwindow", None, u""]]; sys.stdout.write(username + "\n");')
     rm /var/tmp/depnotify* >/dev/null 2>&1
     rm /var/tmp/com.depnotify.* >/dev/null 2>&1
-    rm /Users/"$ACTIVE_USER"/Library/Preferences/menu.nomad.DEPNotify* >/dev/null 2>&1
+    rm "$ACTIVE_USER_HOME"/Library/Preferences/menu.nomad.DEPNotify* >/dev/null 2>&1
     killall cfprefsd
 }
 
@@ -158,10 +158,13 @@ done
 # Capture active user username
 ACTIVE_USER=$(/usr/bin/python -c 'from SystemConfiguration import SCDynamicStoreCopyConsoleUser; import sys; username = (SCDynamicStoreCopyConsoleUser(None, None, None) or [None])[0]; username = [username,""][username in [u"loginwindow", None, u""]]; sys.stdout.write(username + "\n");')
 
+# Capture active user home folder path
+ACTIVE_USER_HOME=$(eval echo ~$ACTIVE_USER)
+
 # Captures active users UID
 uid=$(id -u "$ACTIVE_USER")
-DEP_N_USER_INPUT_PLIST="/Users/$ACTIVE_USER/Library/Preferences/menu.nomad.DEPNotifyUserInput.plist"
-DEP_N_CONFIG_PLIST="/Users/$ACTIVE_USER/Library/Preferences/menu.nomad.DEPNotify.plist"
+DEP_N_USER_INPUT_PLIST="$ACTIVE_USER_HOME/Library/Preferences/menu.nomad.DEPNotifyUserInput.plist"
+DEP_N_CONFIG_PLIST="$ACTIVE_USER_HOME/Library/Preferences/menu.nomad.DEPNotify.plist"
 defaults write "$DEP_N_CONFIG_PLIST" pathToPlistFile "$DEP_N_USER_INPUT_PLIST"
 
 ################################################################################
@@ -255,12 +258,13 @@ DEPenrollmentGroupAdd=$(
 # Waiting for DECRYPT_USER_ID to be bound to system
 echo "Status: Pulling Security Settings from JumpCloud" >>"$DEP_N_LOG"
 
-DECRYPT_USER_ID=$(dscl . -read /Users/$DECRYPT_USER | grep UniqueID | cut -d " " -f 2)
+DECRYPT_USER_HOME=$(eval echo ~$DECRYPT_USER)
+DECRYPT_USER_ID=$(dscl . -read "$DECRYPT_USER_HOME" | grep UniqueID | cut -d " " -f 2)
 
 while [ -z "$DECRYPT_USER_ID" ]; do
     echo "$(date "+%Y-%m-%dT%H:%M:%S"): Waiting for DECRYPT_USER_ID for user $DECRYPT_USER" >>"$DEP_N_DEBUG"
     sleep 1
-    DECRYPT_USER_ID=$(dscl . -read /Users/$DECRYPT_USER | grep UniqueID | cut -d " " -f 2)
+    DECRYPT_USER_ID=$(dscl . -read "$DECRYPT_USER_HOME" | grep UniqueID | cut -d " " -f 2)
 done
 
 echo "Status: Security Settings Configured" >>"$DEP_N_LOG"