Merge branch '3.0b6'

CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## [3.0b6]
+
+2022-01-05
+
+- __UPGRADE NOTICE: Any version of `super` prior to 3.0b4 may unintentionally upgrade computers with macOS 12.6.2 to macOS 13.1+. You should avoid using any version of `super` prior to version 3.0b4 on macOS 12 or newer.__
+- New support for macOS updates/upgrades when a system is enrolled in a beta seed program, as such `super` now properly detects and installs available macOS betas.
+- All logs now show the version of `super` that is running.
+- New Jamf Pro [extension attribute script](https://github.com/Macjutsu/super/blob/main/Super-Friends/super-Installed-Version-Jamf-Pro-EA.sh) collects the currently installed `super` version.
+- macOS upgrade installers are now always downloaded and validated via specific build number (as opposed to version number).
+- Resolved an issue that prevented software updates from downloading on macOS 12.0 - 12.2.
+- Resolved an issue that prevented update/upgrade version numbers from displaying for MDM workflow dialogs on macOS 12.3 or nerwer.
+- Improved failure detection, some logging refinements, and fixed a few typos for good measure.
+- Updated `super` [removal script](https://github.com/Macjutsu/super/blob/main/Super-Friends/Remove-super.sh) now removes erase-install items and any update credentials previously saved by `super`.
+- `super` 3.0b6 SHA-256: b7bae8e206e6af5b3368a032853926830914a1ee9f6b66cc5e46b60b26d19cd3
+
 ## [3.0b5]
 
 2022-12-22

Super-Friends/Remove-super.sh

@@ -14,12 +14,25 @@ superPIDFILE="/var/run/super.pid"
 # This is the name for the LaunchDaemon.
 launchDaemonNAME="com.macjutsu.super" # No trailing ".plist"
 
+# Installation folder:
+superFOLDER="/Library/Management/super"
+
+# Path to the local erase-install folder:
+eraseInstallFOLDER="/Library/Management/erase-install"
+# Comment out the previous line if you don't want to remove erase-install.sh.
+
 # Make sure the script is running with root privileges.
 if [[ "$(id -u)" -ne 0 ]]; then
 	echo "Exit: $(basename "$0") must run with root privileges."
 	exit 1
 fi
 
+# If super is still installed normally, use it to reset all settings and delete accounts.
+if [[ -f "$superFOLDER/super" ]]; then
+	echo "Running super one last time to clean up and delete accounts..."
+	"$superFOLDER/super" --reset-super --skip-updates --delete-accounts
+fi
+
 # Check for any previous super process still running, if so kill it.
 if [[ -f "$superPIDFILE" ]]; then
 	previousPID=$(cat "$superPIDFILE")
@@ -41,10 +54,16 @@ fi
 
 # This removes super folder items.
 if [[ -d "$superFOLDER" ]]; then
-	echo "Removing installed super items."
+	echo "Removing super items."
 	rm -Rf "$superFOLDER" > /dev/null 2>&1
 	rm -f "$superLINK" > /dev/null 2>&1
 	rm -f "$superPIDFILE" > /dev/null 2>&1
 fi
 
+# This removes erase-install folder items.
+if [[ -d "$eraseInstallFOLDER" ]]; then
+	echo "Removing erase-install.sh items."
+	rm -Rf "$eraseInstallFOLDER" > /dev/null 2>&1
+fi
+
 exit 0

Super-Friends/super-Installed-Version-Jamf-Pro-EA.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# This script returns the installed super version reported by super 3.0 or later.
+# This script must be run as root or via Jamf Pro.
+
+# Path to a local super script:
+superSCRIPT="/Library/Management/super/super"
+
+# Report if the file exists.
+if [[ -f "$superSCRIPT" ]]; then
+	superVERSION=$(grep 'superVERSION=' "$superSCRIPT" | sed -e 's/superVERSION=//' -e 's/"//g')
+	# Report if the file has a value.
+	if [[ -n $superVERSION ]]; then
+		echo "<result>$superVERSION</result>"
+	else
+		echo "<result>No Version Number Found.</result>"
+	fi
+else
+	echo "<result>Not Installed.</result>"
+fi
+
+exit 0