Hide useless systemsetup errors and avoid scary Safari kill error

.cirrus.yml

@@ -69,9 +69,9 @@ task:
   push_ecr_script: |
     if [[ $CIRRUS_TAG == *"beta"* ]]
     then
-      tart push  --chunk-size=5 sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$XCODE_VERSION
+      tart push  --chunk-size=5 sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$CIRRUS_TAG
     else
-      tart push  --chunk-size=5 sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$XCODE_VERSION public.ecr.aws/cirruslabs/macos:sonoma-xcode
+      tart push  --chunk-size=5 sonoma-xcode:$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode-$CIRRUS_TAG public.ecr.aws/cirruslabs/macos:sonoma-xcode
     fi
   always:
     cleanup_script:

templates/vanilla-monterey.pkr.hcl

@@ -93,13 +93,15 @@ build {
       // Disable screensaver for admin user
       "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
-      "sudo systemsetup -setdisplaysleep Off",
+      "sudo systemsetup -setdisplaysleep Off 2>/dev/null",
-      "sudo systemsetup -setsleep Off",
+      "sudo systemsetup -setsleep Off 2>/dev/null",
-      "sudo systemsetup -setcomputersleep Off",
+      "sudo systemsetup -setcomputersleep Off 2>/dev/null",
       // Launch Safari to populate the defaults
       "/Applications/Safari.app/Contents/MacOS/Safari &",
-      "sleep 3",
+      "SAFARI_PID=$!",
-      "kill -9 %1",
+      "disown",
+      "sleep 30",
+      "kill -9 $SAFARI_PID",
       // Enable Safari's remote automation and "Develop" menu
       "sudo safaridriver --enable",
       "defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true",

templates/vanilla-sonoma.pkr.hcl

@@ -97,13 +97,15 @@ build {
       // Disable screensaver for admin user
       "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
-      "sudo systemsetup -setdisplaysleep Off",
+      "sudo systemsetup -setdisplaysleep Off 2>/dev/null",
-      "sudo systemsetup -setsleep Off",
+      "sudo systemsetup -setsleep Off 2>/dev/null",
-      "sudo systemsetup -setcomputersleep Off",
+      "sudo systemsetup -setcomputersleep Off 2>/dev/null",
       // Launch Safari to populate the defaults
       "/Applications/Safari.app/Contents/MacOS/Safari &",
+      "SAFARI_PID=$!",
+      "disown",
       "sleep 30",
-      "kill -9 %1",
+      "kill -9 $SAFARI_PID",
       // Enable Safari's remote automation and "Develop" menu
       "sudo safaridriver --enable",
       "defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true",

templates/vanilla-ventura.pkr.hcl

@@ -99,13 +99,15 @@ build {
       // Disable screensaver for admin user
       "defaults -currentHost write com.apple.screensaver idleTime 0",
       // Prevent the VM from sleeping
-      "sudo systemsetup -setdisplaysleep Off",
+      "sudo systemsetup -setdisplaysleep Off 2>/dev/null",
-      "sudo systemsetup -setsleep Off",
+      "sudo systemsetup -setsleep Off 2>/dev/null",
-      "sudo systemsetup -setcomputersleep Off",
+      "sudo systemsetup -setcomputersleep Off 2>/dev/null",
       // Launch Safari to populate the defaults
       "/Applications/Safari.app/Contents/MacOS/Safari &",
+      "SAFARI_PID=$!",
+      "disown",
       "sleep 30",
-      "kill -9 %1",
+      "kill -9 $SAFARI_PID",
       // Enable Safari's remote automation and "Develop" menu
       "sudo safaridriver --enable",
       "defaults write com.apple.Safari.SandboxBroker ShowDevelopMenu -bool true",

variables.pkrvars.hcl

@@ -1,3 +1,3 @@
 macos_version = "sonoma"
 gha_version   = "2.311.0"
-xcode_version = "15.0.1"
+xcode_version = "15.1"