From 968f1eccac001ab5122427d7870e764c95b2830b Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:53:36 +0000
Subject: [PATCH] Update dockutil-labels-user.sh

---
 dockutil-labels-user.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dockutil-labels-user.sh b/dockutil-labels-user.sh
index 8f403af..1241ead 100644
--- a/dockutil-labels-user.sh
+++ b/dockutil-labels-user.sh
@@ -262,31 +262,31 @@ fi
 		 APPNA="Microsoft Office"
 		 echo "Status: adding $APPNA to the Dock" >> $DEPLOG
 		 echo "removing $APPNA from the Dock"
-		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Word" --no-restart --homeloc /Users/$currentUser/
+		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Word" --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		  sleep .5
-		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Excel" --no-restart --homeloc /Users/$currentUser/
+		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Excel" --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		  sleep .5
-		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Powerpoint" --no-restart --homeloc /Users/$currentUser/
+		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Powerpoint" --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		  sleep .5
-		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Outlook" --no-restart --homeloc /Users/$currentUser/
+		  runAsUser /usr/local/bin/dockutil --remove "Microsoft Outlook" --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		 sleep .5
 		 echo "adding Microsoft Office to the Dock"
 		 sleep .5
-		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Word.app --position 6 --no-restart --homeloc /Users/$currentUser/
+		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Word.app --position 6 --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		 sleep .5
-		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Excel.app --position 7 --no-restart --homeloc /Users/$currentUser/
+		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Excel.app --position 7 --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		 sleep .5
-		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Powerpoint.app --position 8 --no-restart --homeloc /Users/$currentUser/
+		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Powerpoint.app --position 8 --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		 sleep .5
-		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Outlook.app --position 9 --no-restart --homeloc /Users/$currentUser/
+		 runAsUser /usr/local/bin/dockutil --add /Applications/Microsoft\ Outlook.app --position 9 --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		 sleep .5
 	 else
 		echo "Status: adding $APPNA to the Dock" >> $DEPLOG
 		echo "removing $APPNA from the Dock"
-		runAsUser /usr/local/bin/dockutil --remove "$APPNA" --no-restart --homeloc /Users/$currentUser/
+		runAsUser /usr/local/bin/dockutil --remove "$APPNA" --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		sleep .5
 		echo "adding $APPNA to the Dock"
-		runAsUser /usr/local/bin/dockutil --add "$APPPA/$APPNA.app" --position $DOCKPOS   --no-restart --homeloc /Users/$currentUser/
+		runAsUser /usr/local/bin/dockutil --add "$APPPA/$APPNA.app" --position $DOCKPOS --no-restart --homeloc /Users/$(stat -f "%Su" /dev/console)/
 		sleep .5
    fi