From c902dc353c8a90e5a4e1c3b108cd6cae024e324d Mon Sep 17 00:00:00 2001 From: Michael <30936296+mtan93@users.noreply.github.com> Date: Mon, 6 Feb 2023 13:20:01 +0000 Subject: [PATCH] Update launch-dock-add.sh --- Helpers/launch-dock-add.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Helpers/launch-dock-add.sh b/Helpers/launch-dock-add.sh index 4a23abc..06841c3 100644 --- a/Helpers/launch-dock-add.sh +++ b/Helpers/launch-dock-add.sh @@ -3,13 +3,23 @@ # SERVICE SCRIPT CALLED BY OTHER SCRIPTS -# RUNS AS USER -#sudo -u $(stat -f "%Su" /dev/console) /bin/sh <<'END' -#export CURL_SSL_BACKEND="secure-transport" +currentUser=$( echo "show State:/Users/ConsoleUser" | scutil | awk '/Name :/ { print $3 }' ) +uid=$(id -u "$currentUser") +runAsUser() { + if [ "$currentUser" != "loginwindow" ]; then + launchctl asuser "$uid" sudo -u "$currentUser" "$@" + else + echo "no user logged in" + exit 1 + fi +} if [ "$EMPTYDOCK" == "Y" ]; then - echo "Dock will reset" + if [ "$ASUSER" == "Y" ]; then + runAsUser /usr/local/bin/dockutil --remove all +else /usr/local/bin/dockutil --remove all --allhomes +fi else echo "Dock will not reset" echo Continuing...