search

kc9wwh / macOSUpgrade

Workflow for doing in-place upgrades.
Other
420 stars 103 forks source link

Improve os version check #172

Closed taniguti closed 3 years ago

taniguti commented 3 years ago

Fix #168 by new function get_install_os_info().

prepare-jamf-policy.sh

% ./prepare-jamf-policy.sh ~/Desktop/Install\ macOS\ Big\ Sur.app
Wait minutes, getting checksum...

=====================================================
Parameters for JamfPro policy:
Parameter 4: /Applications/Install macOS Big Sur.app
Parameter 5: 11.3.1
Parameter 6: (Your download trigger policy)
Parameter 7: 030d4a5edb65f5c757f1639925c47f5a
=====================================================
Would you need a dmg archive of Install macOS Big Sur.app? [y/n]: y
Ok, creating dmg archive file of Install macOS Big Sur.app. Wait few minutes.
Done. See ~/Downloads/Install macOS Big Sur.11.3.1-20E241
% ls ~/Downloads/Install\ macOS\ Big\ Sur.11.3.1-20E241
./                                           Install macOS Big Sur.app.11.3.1-20E241.dmg
../                                          Install macOS Big Sur.app.11.3.1-20E241.txt
%

macOSUpgrade.sh

Tested case: ✅ from 10.15.7 to 11.3.1

installerVersion_Full_Integer 110301
installerVersion_Major_Integer 1103
Killing caffeinate processes.
No matching processes were found
Killing startosinstall processes.
No matching processes were found
Killing osinstallersetupd processes.
No matching processes were found
Power Check: OK - AC Power Detected
Disk Check: OK - 63512398992 Bytes Free Space Detected
Installer check: Expected: 11.3.1 Actual: 11.0.1
Try to download installer.app. (1 / 3 )
Downloading macOS Installer...
Unable to create basic Accelerated OpenGL renderer.
Unable to create basic Accelerated OpenGL renderer.
Core Image is now using the software OpenGL renderer. This will be slow.
Checking for policies triggered by "download-bigsur" for user "john.q"...
Executing Policy Download Big Sur Installer
Downloading https://use1-jcds.services.jamfcloud.com//download/2aecf55bf9534451a37eb52204e58162/Install%20macOS%20Big%20Sur.app.11.3.1-20E241.dmg?token=a4749d0ef8c74da6b4cd71300a6c38c674a48k3yptiuuk6rd8pl9foz9dlek2kw...
Verifying DMG...
Verifying package integrity...
Installing Install macOS Big Sur.app.11.3.1-20E241.dmg...
Closing package...
Submitting log to https://onishidev.jamfcloud.com/
Installer check: Target version is ok (11.3.1).
Installer check: DMG file is Valid
Installer check: PASSED
Launching jamfHelper as FullScreen.
Running a command as '"/Applications/Install macOS Big Sur.app/Contents/Resources/startosinstall" --agreetolicense --nointeraction --pidtosignal 1208 --forcequitapps >> /var/log/startosinstall.log 2>&1 &'...

✅ from 10.14.6 to 10.15.5

installerVersion_Full_Integer 101505
installerVersion_Major_Integer 1015
Killing caffeinate processes.
No matching processes were found
Killing startosinstall processes.
No matching processes were found
Killing osinstallersetupd processes.
No matching processes were found
Power Check: OK - AC Power Detected
Disk Check: OK - 72454710024 Bytes Free Space Detected
Installer check: Expected: 10.15.5 Actual: 10.15.6
Try to download installer.app. (1 / 3 )
Downloading macOS Installer...
Checking for policies triggered by "download-catalina" for user "john.q"...
Executing Policy Download Catalina Installer
Downloading Install macOS Catalina.app.10.15.5(19F101).pkg...
Downloading https://use1-jcds.services.jamfcloud.com//download/2aecf55bf9534451a37eb52204e58162/Install%20macOS%20Catalina.app.10.15.5%2819F101%29.pkg?token=a4749d0ef8c74da6b4cd71300a6c38c674a48k3yptiuuk6rd8pl9foz9dlek2kw...
Verifying package integrity...
Installing Install macOS Catalina.app.10.15.5(19F101).pkg...
Successfully installed Install macOS Catalina.app.10.15.5(19F101).pkg.
Submitting log to https://onishidev.jamfcloud.com/
Installer check: Target version is ok (10.15.5).
Installer check: DMG file is Valid
Installer check: PASSED
Launching jamfHelper as FullScreen.
Running a command as '"/Applications/Install macOS Catalina.app/Contents/Resources/startosinstall" --agreetolicense --nointeraction --pidtosignal 1378 --forcequitapps >> /var/log/startosinstall.log 2>&1 &'...
taniguti commented 3 years ago

@kc9wwh Hi, Could you check this PR?

kc9wwh commented 3 years ago

@kc9wwh Hi, Could you check this PR?

Yes, I’ll review this today.

taniguti commented 3 years ago

Thanks @kc9wwh !