Index: branches/blackosx/package/Scripts/Main/postinstall =================================================================== --- branches/blackosx/package/Scripts/Main/postinstall (revision 1730) +++ branches/blackosx/package/Scripts/Main/postinstall (revision 1731) @@ -105,10 +105,13 @@ # need to delete the Keylayout module and Keymaps that were automatically # installed to the temporary /Extra folder (controlled by the call to # buildpackage for keylayouts in buildpkg.sh). - if [ $keyLayoutOption == 0 ]; then - rm -rf "$chamTemp"/Extra/Keymaps/ - rm -f "$chamTemp"/Extra/modules/Keylayout.dylib - fi + + # UPDATE - After discussion with JrCs, it was decided to leave + # these in by default so this has been commented out. + # if [ $keyLayoutOption == 0 ]; then + #rm -rf "$chamTemp"/Extra/Keymaps/ + #rm -f "$chamTemp"/Extra/modules/Keylayout.dylib + # fi # If exclusive options were used and the 'None' option was chosen, # then a dummy file named DONT=ADD would be in /$chamTemp/Extra/options. Index: branches/blackosx/package/Resources/en.lproj/Localizable.strings =================================================================== --- branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1730) +++ branches/blackosx/package/Resources/en.lproj/Localizable.strings (revision 1731) @@ -44,7 +44,7 @@ // Modules // ---------------------------------------------------------------------------- "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. "; +"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. The Keylayout module and associated keymaps are installed by default."; "AMDGraphicsEnabler_title" = "AMDGraphicsEnabler"; "AMDGraphicsEnabler_description" = "The GraphicsEnabler ATI code ( > r784) ported to a module. @@ -81,7 +81,7 @@ Dependencies: klibc"; "Keylayout_title" = "Keylayout"; -"Keylayout_description" = "This module permits the user to define the keyboard key mappings."; +"Keylayout_description" = "This module permits the user to define the keyboard key mappings. This module and associated keymaps are installed by default."; // ============================================================================ @@ -325,7 +325,7 @@ // KeyLayout "KeyLayout_title" = "KeyLayout"; -"KeyLayout_description" = "Set one keylayout to use, or select 'None' if you don't want to select a keylayout. This option will also install the Keylayout module and Keymaps."; +"KeyLayout_description" = "Set one keylayout to use, or select 'None' if you don't want to select a keylayout."; // Themes "Themes_title" = "Themes"; Index: branches/blackosx/package/buildpkg.sh =================================================================== --- branches/blackosx/package/buildpkg.sh (revision 1730) +++ branches/blackosx/package/buildpkg.sh (revision 1731) @@ -216,7 +216,7 @@ # automatically to the temporary /Extra folder without giving the user an option. # Then, in Scripts/Main/postinstall we will check to see if the user selected a # keymap - if they did then we'll copy these files otherwise we'll ignore them. - buildpackage "${1}/Keylayout" "/$chamTemp" "" "start_visible=\"false\"" "start_selected=\"true\"" >/dev/null 2>&1 + buildpackage "${1}/Keylayout" "/$chamTemp" "" "start_enabled=\"false\"" "start_selected=\"true\"" >/dev/null 2>&1 } fi