diff --git a/Helpers/launch-app-installo-beta.sh b/Helpers/launch-app-installo-beta.sh deleted file mode 100644 index c0c8f22..0000000 --- a/Helpers/launch-app-installo-beta.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/zsh -# launch-app-installo.sh - -# SERVICE SCRIPT CALLED BY OTHER SCRIPTS - -# INSTALLS APPLICATION -sleep 5 -curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/install-app-loop-beta.sh?v=123$(date +%s) | bash - -# CHECKS TO ADD TO DOCK OR NOT -if [ "$MDMADDTODOCK" == "Y" ]; then - echo "SCRIPT WILL TRY TO ADD TO DOCK" - curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/add-to-dock.sh?v=123$(date +%s) | bash - sleep 2 - killall Dock -else - echo "SCRIPT WILL NOT TRY TO ADD TO DOCK" - echo Continuing... -fi diff --git a/Helpers/launch-app-installo-old.sh b/Helpers/launch-app-installo-old.sh new file mode 100644 index 0000000..c8983b2 --- /dev/null +++ b/Helpers/launch-app-installo-old.sh @@ -0,0 +1,49 @@ +#!/bin/zsh +# launch-app-installo.sh + +# 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" + +# CHECKS FOR DIALOG AND PRESENTS IF REQUESTED +if [ "$SHOWDIALOG" == "Y" ]; then + echo "Dialog will open" + curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/show-dialog-depnotify.sh?v=123$(date +%s) | bash +else + echo "Dialog will not open" + echo Continuing... +fi + +# INSTALLS APPLICATION +sleep 5 +curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/install-app-loop.sh?v=123$(date +%s) | bash + +# CHECKS TO ADD TO DOCK OR NOT +if [ "$MDMADDTODOCK" == "Y" ]; then + echo "SCRIPT WILL TRY TO ADD TO DOCK" + curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/add-to-dock.sh?v=123$(date +%s) | bash + sleep 2 + killall Dock +else + echo "SCRIPT WILL NOT TRY TO ADD TO DOCK" + echo Continuing... +fi + +echo "Command: DeterminateManualStep: 1" >> /var/tmp/depnotify.log + +if [ "$SHOWDIALOG" == "Y" ]; then + # MOVES DEPNOTIFY STATUS BAR + echo Command: MainTitle: Installed "$MDMAPPNAME" >> /var/tmp/depnotify.log + echo 'Command: Image: /Library/Application Support/Purple/logo.png' >> /var/tmp/depnotify.log + echo Command: MainText: "The install or update for $MDMAPPNAME has finished". >> /var/tmp/depnotify.log + + echo "Command: DeterminateManualStep: 1" >> /var/tmp/depnotify.log + + echo 'Command: WindowStyle: Activate' >> /var/tmp/depnotify.log + echo 'Command: ContinueButton: Finish' >> /var/tmp/depnotify.log + echo "Status: Installed or Updated $MDMAPPNAME, click Finish!" >> /var/tmp/depnotify.log +else +echo +fi diff --git a/Helpers/launch-app-installo.sh b/Helpers/launch-app-installo.sh index c8983b2..c0c8f22 100644 --- a/Helpers/launch-app-installo.sh +++ b/Helpers/launch-app-installo.sh @@ -3,22 +3,9 @@ # 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" - -# CHECKS FOR DIALOG AND PRESENTS IF REQUESTED -if [ "$SHOWDIALOG" == "Y" ]; then - echo "Dialog will open" - curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/show-dialog-depnotify.sh?v=123$(date +%s) | bash -else - echo "Dialog will not open" - echo Continuing... -fi - # INSTALLS APPLICATION sleep 5 -curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/install-app-loop.sh?v=123$(date +%s) | bash +curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/install-app-loop-beta.sh?v=123$(date +%s) | bash # CHECKS TO ADD TO DOCK OR NOT if [ "$MDMADDTODOCK" == "Y" ]; then @@ -30,20 +17,3 @@ else echo "SCRIPT WILL NOT TRY TO ADD TO DOCK" echo Continuing... fi - -echo "Command: DeterminateManualStep: 1" >> /var/tmp/depnotify.log - -if [ "$SHOWDIALOG" == "Y" ]; then - # MOVES DEPNOTIFY STATUS BAR - echo Command: MainTitle: Installed "$MDMAPPNAME" >> /var/tmp/depnotify.log - echo 'Command: Image: /Library/Application Support/Purple/logo.png' >> /var/tmp/depnotify.log - echo Command: MainText: "The install or update for $MDMAPPNAME has finished". >> /var/tmp/depnotify.log - - echo "Command: DeterminateManualStep: 1" >> /var/tmp/depnotify.log - - echo 'Command: WindowStyle: Activate' >> /var/tmp/depnotify.log - echo 'Command: ContinueButton: Finish' >> /var/tmp/depnotify.log - echo "Status: Installed or Updated $MDMAPPNAME, click Finish!" >> /var/tmp/depnotify.log -else -echo -fi