[PC-BSD Commits] r408 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2007-07-02 22:54:32 +0100 (Mon, 02 Jul 2007)
New Revision: 408

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Few changes to ensure they keyboard layout gets saved properly, since the
language key isn't always the same thing. 




Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2007-07-02 17:34:33 UTC (rev 407)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2007-07-02 21:54:32 UTC (rev 408)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 LANG="${1}"
-START="${2}"
+KEYLAYOUT="${2}"
 
 COUNTRY="${LANG}"
 SETLANG="${LANG}"
@@ -124,7 +124,7 @@
 mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kdeglobals 
 
 # Change the keyboard layout tool
-sed -e "s/CHANGEME/${SETLANG},us/g" /mnt/usr/share/skel/.kde/share/config/kxkbrc > /mnt/tmp/sed
+sed -e "s/CHANGEME/${KEYLAYOUT},us/g" /mnt/usr/share/skel/.kde/share/config/kxkbrc > /mnt/tmp/sed
 
 mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kxkbrc
 
@@ -163,7 +163,7 @@
   fi
 
   # Change the keyboard layout tool
-  sed -e "s/CHANGEME/${SETLANG},us/g" /mnt/usr/home/${i}/.kde/share/config/kxkbrc > /mnt/tmp/sed
+  sed -e "s/CHANGEME/${KEYLAYOUT},us/g" /mnt/usr/home/${i}/.kde/share/config/kxkbrc > /mnt/tmp/sed
 
   mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kxkbrc
 done

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2007-07-02 17:34:33 UTC (rev 407)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2007-07-02 21:54:32 UTC (rev 408)
@@ -37,7 +37,7 @@
    # Copy the right splash screen over
     cp /mnt/PCBSD/splash-screens/loading-screen-${LANG}.pcx /mnt/boot/loading-screen.pcx
    # Run the Localize script
-   /usr/local/pcbsd/scripts/PCBSD.Localize.sh ${LANG} ${3}
+   /usr/local/pcbsd/scripts/PCBSD.Localize.sh ${LANG} ${KEYLAYOUT}
 else
 
   # Remove the keyboard switcher from loading