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

[svn at pcbsd.org]

Author: kris
Date: 2007-07-02 18:34:33 +0100 (Mon, 02 Jul 2007)
New Revision: 407

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

Made changes to install scripts to set kxkbrc file properly



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2007-07-02 17:23:31 UTC (rev 406)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2007-07-02 17:34:33 UTC (rev 407)
@@ -24,7 +24,7 @@
 #Reset LANG
 LANG="$LANGOLD"
 
-#echo "Copying boot files...";
+echo "Setting up kernel...";
 cp f /usr/local/pcbsd/LANGS/* /mnt/PCBSD/LANGS/ >/dev/null
 
 cp /tmp/fstab /mnt/etc/fstab

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:23:31 UTC (rev 406)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2007-07-02 17:34:33 UTC (rev 407)
@@ -118,10 +118,16 @@
 
 mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kdeglobals
 
+# Change the language
 sed -e "s/Language=en_US/Language=${SETLANG}/g" /mnt/usr/share/skel/.kde/share/config/kdeglobals > /mnt/tmp/sed
 
 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
+
+mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kxkbrc
+
 #Change the root files
 sed -e "s/Country=C/Country=${COUNTRY}/g" /mnt/root/.kde/share/config/kdeglobals  > /mnt/tmp/sed
 
@@ -155,6 +161,11 @@
   mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kdeglobals 
 
   fi
+
+  # Change the keyboard layout tool
+  sed -e "s/CHANGEME/${SETLANG},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
 
 if [ "${LANG}" = "ja" ]

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:23:31 UTC (rev 406)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2007-07-02 17:34:33 UTC (rev 407)
@@ -38,6 +38,19 @@
     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}
+else
+
+  # Remove the keyboard switcher from loading
+  rm /mnt/usr/share/skel/.kde/share/config/kxkbrc
+
+  # Remove it from the user profiles as well
+  cd /mnt/usr/home
+  for i in `ls`
+  do
+    rm /mnt/usr/home/${i}/.kde/share/config/kxkbrc
+  done
+  cd / 
+
 fi