Update golden scripts for warp and box fix (#23696)

#22773

Added/updated tests

server/mdm/maintainedapps/scripts_test.go

@@ -36,6 +36,9 @@ func TestScriptGeneration(t *testing.T) {
 		err = json.Unmarshal(caskJSON, &cask)
 		require.NoError(t, err)
 
+		cask.PreUninstallScripts = app.PreUninstallScripts
+		cask.PostUninstallScripts = app.PostUninstallScripts
+
 		t.Run(app.Identifier, func(t *testing.T) {
 			installScript, err := installScriptForApp(app, &cask)
 			require.NoError(t, err)

server/mdm/maintainedapps/testdata/scripts/1password_uninstall.golden.sh

@@ -9,6 +9,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -20,7 +21,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/adobe-acrobat-reader_uninstall.golden.sh

@@ -47,15 +47,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -69,7 +69,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -77,7 +77,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -91,6 +91,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -102,7 +103,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/box-drive_uninstall.golden.sh

@@ -47,15 +47,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -69,7 +69,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -77,7 +77,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -91,6 +91,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -102,20 +103,26 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi
 }
 
+(cd /Users/$LOGGED_IN_USER; sudo -u $LOGGED_IN_USER fileproviderctl domain remove -A com.box.desktop.boxfileprovider)
+(cd /Users/$LOGGED_IN_USER; sudo -u $LOGGED_IN_USER /Applications/Box.app/Contents/MacOS/fpe/streem --remove-fpe-domain-and-archive-unsynced-content Box)
+(cd /Users/$LOGGED_IN_USER; sudo -u $LOGGED_IN_USER /Applications/Box.app/Contents/MacOS/fpe/streem --remove-fpe-domain-and-preserve-unsynced-content Box)
+(cd /Users/$LOGGED_IN_USER; defaults delete com.box.desktop)
+echo "${LOGGED_IN_USER} ALL = (root) NOPASSWD: /Library/Application\ Support/Box/uninstall_box_drive_r" >> /etc/sudoers.d/box_uninstall
 remove_launchctl_service 'com.box.desktop.helper'
 quit_application 'com.box.Box-Local-Com-Server'
 quit_application 'com.box.desktop'
 quit_application 'com.box.desktop.findersyncext'
 quit_application 'com.box.desktop.helper'
 quit_application 'com.box.desktop.ui'
-sudo -u "$LOGGED_IN_USER" '/Library/Application Support/Box/uninstall_box_drive'
+(cd /Users/$LOGGED_IN_USER && sudo -u "$LOGGED_IN_USER" '/Library/Application Support/Box/uninstall_box_drive')
 sudo pkgutil --forget 'com.box.desktop.installer.*'
+rm /etc/sudoers.d/box_uninstall
 trash $LOGGED_IN_USER '~/.Box_*'
 trash $LOGGED_IN_USER '~/Library/Application Support/Box/Box'
 trash $LOGGED_IN_USER '~/Library/Application Support/FileProvider/com.box.desktop.boxfileprovider'

server/mdm/maintainedapps/testdata/scripts/brave-browser_uninstall.golden.sh

@@ -9,6 +9,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -20,7 +21,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/cloudflare-warp_uninstall.golden.sh

@@ -47,15 +47,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -69,7 +69,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -77,7 +77,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -91,6 +91,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -102,7 +103,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/docker_uninstall.golden.sh

@@ -48,15 +48,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -70,7 +70,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -78,7 +78,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -92,6 +92,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -103,7 +104,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/figma_uninstall.golden.sh

@@ -9,6 +9,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -20,7 +21,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/firefox_uninstall.golden.sh

@@ -47,6 +47,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -58,7 +59,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/google-chrome_uninstall.golden.sh

@@ -10,15 +10,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -32,7 +32,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -40,7 +40,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -54,6 +54,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -65,7 +66,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/microsoft-edge_uninstall.golden.sh

@@ -9,15 +9,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -31,7 +31,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -39,7 +39,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -53,6 +53,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -64,7 +65,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/microsoft-excel_uninstall.golden.sh

@@ -47,15 +47,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -69,7 +69,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -77,7 +77,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -91,6 +91,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -102,7 +103,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/microsoft-teams_uninstall.golden.sh

@@ -47,15 +47,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -69,7 +69,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -77,7 +77,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -91,6 +91,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -102,7 +103,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/microsoft-word_uninstall.golden.sh

@@ -47,15 +47,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -69,7 +69,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -77,7 +77,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -91,6 +91,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -102,7 +103,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/notion_uninstall.golden.sh

@@ -9,6 +9,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -20,7 +21,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/postman_uninstall.golden.sh

@@ -9,6 +9,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -20,7 +21,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/slack_uninstall.golden.sh

@@ -47,6 +47,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -58,7 +59,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/teamviewer_uninstall.golden.sh

@@ -47,15 +47,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -69,7 +69,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -77,7 +77,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -91,6 +91,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -102,7 +103,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/visual-studio-code_uninstall.golden.sh

@@ -48,15 +48,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -70,7 +70,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -78,7 +78,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -92,6 +92,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -103,7 +104,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/whatsapp_uninstall.golden.sh

@@ -9,6 +9,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -20,7 +21,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi

server/mdm/maintainedapps/testdata/scripts/zoom_uninstall.golden.sh

@@ -9,15 +9,15 @@ remove_launchctl_service() {
   local booleans=("true" "false")
   local plist_status
   local paths
-  local sudo
+  local should_sudo
 
   echo "Removing launchctl service ${service}"
 
-  for sudo in "${booleans[@]}"; do
+  for should_sudo in "${booleans[@]}"; do
     plist_status=$(launchctl list "${service}" 2>/dev/null)
 
     if [[ $plist_status == \{* ]]; then
-      if [[ $sudo == "true" ]]; then
+      if [[ $should_sudo == "true" ]]; then
         sudo launchctl remove "${service}"
       else
         launchctl remove "${service}"
@@ -31,7 +31,7 @@ remove_launchctl_service() {
     )
 
     # if not using sudo, prepend the home directory to the paths
-    if [[ $sudo == "false" ]]; then
+    if [[ $should_sudo == "false" ]]; then
       for i in "${!paths[@]}"; do
         paths[i]="${HOME}${paths[i]}"
       done
@@ -39,7 +39,7 @@ remove_launchctl_service() {
 
     for path in "${paths[@]}"; do
       if [[ -e "$path" ]]; then
-        if [[ $sudo == "true" ]]; then
+        if [[ $should_sudo == "true" ]]; then
           sudo rm -f -- "$path"
         else
           rm -f -- "$path"
@@ -92,6 +92,7 @@ trash() {
   local logged_in_user="$1"
   local target_file="$2"
   local timestamp="$(date +%Y-%m-%d-%s)"
+  local rand="$(jot -r 1 0 99999)"
 
   # replace ~ with /Users/$logged_in_user
   if [[ "$target_file" == ~* ]]; then
@@ -103,7 +104,7 @@ trash() {
 
   if [[ -e "$target_file" ]]; then
     echo "removing $target_file."
-    mv -f "$target_file" "$trash/${file_name}_${timestamp}"
+    mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}"
   else
     echo "$target_file doesn't exist."
   fi