Index: branches/blackosx/package/Distribution =================================================================== --- branches/blackosx/package/Distribution (revision 1770) +++ branches/blackosx/package/Distribution (revision 1771) @@ -41,8 +41,12 @@ function get_chameleon_boot_plist() { if (my.target) { - var chameleon_boot_plist = my.target.mountpoint + '/Extra/org.chameleon.Boot.plist' - return system.files.plistAtPath(chameleon_boot_plist); + var boot_plist_filenames = new Array( 'org.chameleon.Boot.plist', 'com.apple.Boot.plist' ); + for ( var i = 0; i < boot_plist_filenames.length; i++ ) { + var plist = system.files.plistAtPath( my.target.mountpoint + '/Extra/' + boot_plist_filenames[i] ); + if (plist) + return plist; + } } return null; } Index: branches/blackosx/package/Changes.txt =================================================================== --- branches/blackosx/package/Changes.txt (revision 1770) +++ branches/blackosx/package/Changes.txt (revision 1771) @@ -1,3 +1,13 @@ +- JrCs - Look for a com.apple.Boot.plist file for users upgrading from legacy installations + +- Only create Chameleon.Backups and write to the install log, if required. + +- JrCs - Improved backup of chameleon files + +- JrCs - Automaticaly select previous options + +- JrCs - Improved buildpkg script - Simplify the construction of options menu - Add a lot of checks to avoid the construction of a bad XML file + - Change Localizable.strings to match the recent changes to the install process. - Improve messages written to the installation log. Index: branches/blackosx/package/Scripts/Main/postinstall =================================================================== --- branches/blackosx/package/Scripts/Main/postinstall (revision 1770) +++ branches/blackosx/package/Scripts/Main/postinstall (revision 1771) @@ -73,8 +73,6 @@ mkdir "$chamTemp"/Extra fi - tempOCBP="$chamTemp"/Extra/org.chameleon.Boot.plist - # Create template for org.chameleon.Boot.plist" tempOCBP="$chamTemp"/Extra/org.chameleon.Boot.plist cp "$4"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist "$tempOCBP" Index: branches/blackosx/package/Scripts/Main/preinstall =================================================================== --- branches/blackosx/package/Scripts/Main/preinstall (revision 1770) +++ branches/blackosx/package/Scripts/Main/preinstall (revision 1771) @@ -7,12 +7,16 @@ echo "" # Creates text file named 'Chameleon_Installer_Log.txt' -# at the root of the target volume. This is to help show the -# user why the installation process failed (even though the +# at the root of the target volume. This is to give the user +# a record of the installation process and also to show why +# possibly the installation process failed (even though the # package installer ends reading 'Installation Successful'. +# This script also prepares, then backs up any previous +# stage2 boot file, /Extra folder and install log if they exist. + # Find location of this script in the package installer # so we know where all the other scripts are located. @@ -38,12 +42,12 @@ # --------------------------------------------- -# Preparing Backing up Chameleon files +# Preparing Backing up of Chameleon files # --------------------------------------------- backupDir="${targetVolume}/Chameleon.Backups/"$( date -j "+%F-%Hh%M" ) -mkdir -p "$backupDir" - if [[ -f "$logFile" ]];then + # Only make backupDir if required + mkdir -p "$backupDir" # Backup old log file mv "$logFile" "${backupDir}/${logName}" fi @@ -62,18 +66,23 @@ # --------------------------------------------- # Backing up Chameleon files # --------------------------------------------- -# Backup stage2 -if [[ -f "${targetVolume}/boot" ]];then - echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" - cp -p "${targetVolume}/boot" "${backupDir}/boot" +if [[ -f "${targetVolume}/boot" ]] || [[ -d "${targetVolume}/Extra" ]];then + if [[ ! -d "$backupDir" ]];then + mkdir -p "$backupDir" + fi + # Backup stage2 + if [[ -f "${targetVolume}/boot" ]];then + echo "Backing up stage2 file ${targetVolume}/boot to ${backupDir}/boot" >>"${logFile}" + cp -p "${targetVolume}/boot" "${backupDir}/boot" + fi + # Backup /Extra directory + if [[ -d "${targetVolume}/Extra" ]];then + echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}" + cp -pR "${targetVolume}/Extra" "${backupDir}/Extra" + fi + chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups + echo "======================================================" >>"${logFile}" fi -# Backup /Extra directory -if [[ -d "${targetVolume}/Extra" ]];then - echo "Moving ${targetVolume}/Extra folder to ${backupDir}/Extra" >>"${logFile}" - cp -pR "${targetVolume}/Extra" "${backupDir}/Extra" -fi -chflags -R nohidden "$backupDir" # Remove the invisible flag of files in the backups -echo "======================================================" >>"${logFile}" echo "===============================================" echo "END - Pre-Install Script" Index: branches/blackosx/package/Resources/id.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/id.lproj/Localizable.strings (revision 1770) +++ branches/blackosx/package/Resources/id.lproj/Localizable.strings (revision 1771) @@ -47,22 +47,6 @@ "Module_title" = "Modul Chameleon"; "Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; -"AMDGraphicsEnabler_title" = "AMDGraphicsEnabler"; -"AMDGraphicsEnabler_description" = "Kode GraphicsEnabler ATI ( > r784) yang telah dideportasi ke modul. -Kode ini tidak mendukung adanya 'legacy' dari kartu VGA ATI. -Jika kartu VGA HD anda didukung pada kode sebelumnya dan menemukan kejanggalan dengan kode ini (masalah), harap laporkan ke: -http://forge.voodooprojects.org/p/chameleon/issues/ -Hal yang sama berlaku pada kartu VGA yang belum didukung didalam kode ini. -Hanya kartu VGA yang dikenali dan bekerja dengan baik yang akan ditambahkan."; - -"ATiGraphicsEnabler_title" = "ATiGraphicsEnabler"; -"ATiGraphicsEnabler_description" = "KOde GraphicsEnabler ATI ( < r784) yang telah dideportasi ke modul. -Dukungakn untuk kartu VGA 'legacy'... -Berdasarkan karya Meklort."; - -"IntelGraphicsEnabler_title" = "IntelGraphicsEnabler"; -"IntelGraphicsEnabler_description" = "Mengaktifkan sebagian kartu Intel untuk digunakan tanpa patch/driver apapun, sebagian besar untuk yang versi 'mobile'."; - "klibc_title" = "klibc"; "klibc_description" = "Modul ini menyediakan librari standar c kepada modul untuk menyambung jika librari yang disediakan oleh chameleon kurang memadai. Biasanya digunakan oleh librari uClibc++. Index: branches/blackosx/package/Resources/en.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1770) +++ branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1771) @@ -46,23 +46,6 @@ "Module_title" = "Modules"; "Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; -"AMDGraphicsEnabler_title" = "AMDGraphicsEnabler"; -"AMDGraphicsEnabler_description" = "The GraphicsEnabler ATI code ( > r784) ported to a module. -This code has no support for 'legacy' ATI cards. -If your HD card was supported on the old code and you find -it missing on this, please file an issue at: -http://forge.voodooprojects.org/p/chameleon/issues/ -The same applies to any missing card on this code. -Only cards known to work will be added."; - -"ATiGraphicsEnabler_title" = "ATiGraphicsEnabler"; -"ATiGraphicsEnabler_description" = "The GraphicsEnabler ATI code ( < r784) ported to a module. -Support for 'legacy' cards... -Based on Meklort's work."; - -"IntelGraphicsEnabler_title" = "IntelGraphicsEnabler"; -"IntelGraphicsEnabler_description" = "Enables a few Intel cards to be used out of the box, mostly mobile ones."; - "klibc_title" = "klibc"; "klibc_description" = "This module provides a standard c library for modules to link to if the library provided by chameleon is insufficient. This is currently only used by the uClibc++ library. Index: branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings (revision 1770) +++ branches/blackosx/package/Resources/pt-PT.lproj/Localizable.strings (revision 1771) @@ -44,7 +44,7 @@ // Modules // ---------------------------------------------------------------------------- "Module_title" = "Módulos do Chameleon"; -"Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; +"Module_description" = "O sistema de módulos incorporados ao Chameleon permite que um utilizador ou desenvolvedor estenda a funcionalidade básica sem precisar substituir o arquivo boot principal."; "klibc_title" = "klibc"; "klibc_description" = "Este módulo fornece uma biblioteca C padrão para link, caso a do Chameleon seja insuficiente. Index: branches/blackosx/package/Resources/es.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/es.lproj/Localizable.strings (revision 1770) +++ branches/blackosx/package/Resources/es.lproj/Localizable.strings (revision 1771) @@ -90,44 +90,10 @@ "Module_title" = "Módulos de Chameleon"; -"Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; +"Module_description" = "El sistema de módulos incorporado en Chameleon permite al usuario o desarrollador extender las funcionalidades principales del Bootloader, sin reempalzar el binario principal boot."; -"AMDGraphicsEnabler_title" = "AMDGraphicsEnabler"; - -"AMDGraphicsEnabler_description" = "El código que habilita las gráficas AMD ( > r784) portado a un módulo. - -Este código no tiene soporte para tarjetas ATI 'legacy' o antiguas. - -Si su tarjeta HD estuvo soportada anteriormente por el viejo código y - -no es así con éste, por favor reporte su problema en: - -http://forge.voodooprojects.org/p/chameleon/issues/ - -Lo mismo aplica a cualquier tarjeta sin detección con este nuevo código. - -Sólo aquellas tarjetas conocidas que funcionen bien serán añadidas."; - - - -"ATiGraphicsEnabler_title" = "ATiGraphicsEnabler"; - -"ATiGraphicsEnabler_description" = "El código que habilita las gráficas ATI ( < r784) portado a un módulo. - -Soporte para tarjetas ATI 'legacy'... - -Basado en el trabajo de Meklort."; - - - -"IntelGraphicsEnabler_title" = "IntelGraphicsEnabler"; - -"IntelGraphicsEnabler_description" = "Habilita unas cuantas tarjetas INTEL para su uso directo e inmediato, mayormente las versiones móviles."; - - - "klibc_title" = "klibc"; "klibc_description" = "Este módulo provee una biblioteca estándar C, para que los módulos conecten aún si la biblioteca proporcionada por Chameleon es insuficiente. Index: branches/blackosx/package/Resources/pl.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/pl.lproj/Localizable.strings (revision 1770) +++ branches/blackosx/package/Resources/pl.lproj/Localizable.strings (revision 1771) @@ -47,23 +47,6 @@ "Module_title" = "ModuBy"; "Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; -"AMDGraphicsEnabler_title" = "AMDGraphicsEnabler"; -"AMDGraphicsEnabler_description" = "The GraphicsEnabler ATI code ( > r784) ported to a module. -This code has no support for 'legacy' ATI cards. -If your HD card was supported on the old code and you find -it missing on this, please file an issue at: -http://forge.voodooprojects.org/p/chameleon/issues/ -The same applies to any missing card on this code. -Only cards known to work will be added."; - -"ATiGraphicsEnabler_title" = "ATiGraphicsEnabler"; -"ATiGraphicsEnabler_description" = "The GraphicsEnabler ATI code ( < r784) ported to a module. -Support for 'legacy' cards... -Based on Meklort's work."; - -"IntelGraphicsEnabler_title" = "IntelGraphicsEnabler"; -"IntelGraphicsEnabler_description" = "Enables a few Intel cards to be used out of the box, mostly mobile ones."; - "klibc_title" = "klibc"; "klibc_description" = "Ten moduB dostarcza standardow bibliotek c dla innych moduBów, je[li biblioteka w chameleonie jest niewystarczajca. Aktualnie jest u|ywane tylko przez bibliotek uClibc++. Index: branches/blackosx/package/Resources/sr.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/sr.lproj/Localizable.strings (revision 1770) +++ branches/blackosx/package/Resources/sr.lproj/Localizable.strings (revision 1771) @@ -51,25 +51,6 @@ "Module_title" = "Chameleon Moduli"; "Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; -"AMDGraphicsEnabler_title" = "AMDGraphicsEnabler"; -"AMDGraphicsEnabler_description" = "Kod za ATI grafi -ku aktivaciju ( > r784) prenesen na modul. -Ovaj kod nema podraku za 'legacy' ATI kartice. -Ako je Vaaa HD kartica bila podr~ana na starom kodu i nedostaje vam na ovom, molimo poaaljite upit na: -http://forge.voodooprojects.org/p/chameleon/issues/ -Isto vrijedi i za bilo koju drugu karticu kojoj nedostaje ovaj kod. -Karticama za koje znamo da rade, biti e dodan kod."; - -"ATiGraphicsEnabler_title" = "ATiGraphicsEnabler"; -"ATiGraphicsEnabler_description" = "Kod za ATI grafi -ku aktivaciju ( > r784) prenesen na modul. -Podraka za 'legacy' karte... -Bazirane na Meklortu rade."; - -"IntelGraphicsEnabler_title" = "IntelGraphicsEnabler"; -"IntelGraphicsEnabler_description" = "Uklju -uje nekoliko Intel kartica koje se koriste out of the box, uglavnom mobilne."; - "klibc_title" = "klibc"; "klibc_description" = "Ovaj modul omoguava standard c biblioteku za module za povezivanje ako chameleon biblioteka nije dovoljna. Ovo se trenutno koristi samo sa uClibc++ bibliotekom. Index: branches/blackosx/package/Resources/de.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/de.lproj/Localizable.strings (revision 1770) +++ branches/blackosx/package/Resources/de.lproj/Localizable.strings (revision 1771) @@ -45,7 +45,7 @@ // Modules // ---------------------------------------------------------------------------- "Module_title" = "Chameleon Module"; -"Module_description" = "The modules system incorporated in chameleon allows for a user or developer to extend the core functionality of chameleon without replacing the main boot file."; +"Module_description" = "Das in Chameleon integrierte Modulsystem ermöglicht es dem Benutzer/Entwickler, die Hauptfunktionen von Chameleon zu erweitern ohne die eigentliche boot Datei zu verändern."; "klibc_title" = "klibc"; "klibc_description" = "Dieses Modul stellt eine Standard C-Bibliothek für Module bereit, falls die von Chameleon bereitgestellte Bibliothek nicht ausreicht. Property changes on: branches/blackosx ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r1769-1770