0.19.2

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 No date
 
+## [0.19.2]
+
+26.04.2021
+
+- Another fix to the check that `--fetch-full-installer` can be used.
+- Edited Dutch localizations (thanks to Thijs Vught)
+
 ## [0.19.1]
 
 17.04.2021
@@ -289,7 +296,9 @@ Thanks to '@ahousseini' for various contributions to this release
 
 - Initial version. Expects a manual choice of installer from `installinstallmacos.py`.
 
-[untagged]: https://github.com/grahampugh/erase-install/compare/v0.19.0...HEAD
+[untagged]: https://github.com/grahampugh/erase-install/compare/v0.19.2...HEAD
+[0.19.2]: https://github.com/grahampugh/erase-install/compare/v0.19.1...v0.19.2
+[0.19.1]: https://github.com/grahampugh/erase-install/compare/v0.19.0...v0.19.1
 [0.19.0]: https://github.com/grahampugh/erase-install/compare/v0.18.0...v0.19.0
 [0.18.0]: https://github.com/grahampugh/erase-install/compare/v0.17.4...v0.18.0
 [0.17.4]: https://github.com/grahampugh/erase-install/compare/v0.17.3...v0.17.4

erase-install.sh

@@ -51,36 +51,36 @@ dialog_dl_title_nl="Downloaden macOS"
 
 dialog_dl_desc_en="We need to download the macOS installer to your computer; this will take several minutes."
 dialog_dl_desc_de="Der macOS Installer wird heruntergeladen, dies dauert mehrere Minuten."
-dialog_dl_desc_nl="We moeten het macOS-installatieprogramma naar uw computer downloaden, dit duurt enkele minuten."
+dialog_dl_desc_nl="We moeten het macOS besturingssysteem downloaden, dit duurt enkele minuten."
 
 # Dialogue localizations - erase lockscreen
 dialog_erase_title_en="Erasing macOS"
 dialog_erase_title_de="macOS Wiederherstellen"
-dialog_erase_title_nl="Wissen macOS"
+dialog_erase_title_nl="macOS Herinstalleren"
 
 dialog_erase_desc_en="This computer is now being erased and is locked until rebuilt"
 dialog_erase_desc_de="Der Computer wird jetzt zurückgesetzt und neu gestartet"
-dialog_erase_desc_nl="Deze computer wordt nu gewist en is vergrendeld totdat hij opnieuw is opgebouwd"
+dialog_erase_desc_nl="De computer wordt nu gewist en is vergrendeld totdat deze opnieuw is opgestart"
 
 # Dialogue localizations - reinstall lockscreen
 dialog_reinstall_title_en="Upgrading macOS"
 dialog_reinstall_title_de="Upgrading macOS"
-dialog_reinstall_title_nl="MacOS upgraden"
+dialog_reinstall_title_nl="macOS upgraden"
 
 dialog_reinstall_heading_en="Please wait as we prepare your computer for upgrading macOS."
 dialog_reinstall_heading_de="Bitte warten, das Upgrade macOS wird ausgeführt."
-dialog_reinstall_heading_nl="Even geduld terwijl we uw computer voorbereiden voor het upgraden van macOS."
+dialog_reinstall_heading_nl="Even geduld terwijl we uw computer voorbereiden voor de upgrade van macOS."
 
 dialog_reinstall_desc_en="This process may take up to 30 minutes. Once completed your computer will reboot and begin the upgrade."
 dialog_reinstall_desc_de="Dieser Prozess benötigt bis zu 30 Minuten. Der Mac startet anschliessend neu und beginnt mit dem Update."
-dialog_reinstall_desc_nl="Dit proces duurt ongeveer 30 minuten. Zodra dit is voltooid, wordt uw computer opnieuw opgestart en begint de upgrade.."
+dialog_reinstall_desc_nl="Dit proces duurt ongeveer 30 minuten. Zodra dit is voltooid, wordt uw computer opnieuw opgestart en begint de upgrade."
 
 # Dialogue localizations - confirmation window
 dialog_confirmation_title_en="Erasing macOS"
-dialog_confirmation_desc_en="Are you sure you want to ERASE ALL DATA FROM THIS DEVICE and reinstall macOS?"
-dialog_confirmation_title_nl="MacOS wissen"
+dialog_confirmation_title_de="macOS wiederherstellen"
+dialog_confirmation_title_nl="macOS wissen"
 
-dialog_confirmation_title_de="macOS Wiederherstellen"
+dialog_confirmation_desc_en="Are you sure you want to ERASE ALL DATA FROM THIS DEVICE and reinstall macOS?"
 dialog_confirmation_desc_de="Möchten Sie wirklich ALLE DATEN VON DIESEM GERÄT LÖSCHEN und macOS neu installieren?"
 dialog_confirmation_desc_nl="Weet je zeker dat je ALLE GEGEVENS VAN DIT APPARAAT WILT WISSEN en macOS opnieuw installeert?"
 
@@ -1083,11 +1083,15 @@ if [[ (! -d "$install_macos_app" && ! -f "$installassistant_pkg") || $list ]]; t
     fi
 
     # now run installinstallmacos or softwareupdate
-    if [[ $ffi && (($system_os_major -eq 10 && $system_os_version -ge 15) || $system_os_major -ge 11) ]]; then
-        echo "   [erase-install] OS version is $system_os_major.$system_os_version so can run with --fetch-full-installer option"
-        run_fetch_full_installer
+    if [[ $ffi ]]; then
+        if [[ ($system_os_major -eq 10 && $system_os_version -ge 15) || $system_os_major -ge 11 ]]; then
+            echo "   [erase-install] OS version is $system_os_major.$system_os_version so can run with --fetch-full-installer option"
+            run_fetch_full_installer
+        else
+            echo "   [erase-install] OS version is $system_os_major.$system_os_version so cannot run with --fetch-full-installer option. Falling back to installinstallmacos.py"
+            run_installinstallmacos
+        fi
     else
-        echo "   [erase-install] OS version is $system_os_major.$system_os_version so cannot run with --fetch-full-installer option. Falling back to installinstallmacos.py"
         run_installinstallmacos
     fi
     # Once finished downloading, kill the jamfHelper

pkg/erase-install/build-info.plist

@@ -17,6 +17,6 @@
 	<key>suppress_bundle_relocation</key>
 	<true/>
 	<key>version</key>
-	<string>0.19.1</string>
+	<string>0.19.2</string>
 </dict>
 </plist>