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

[svn at pcbsd.org]

Author: kris
Date: 2007-06-08 18:56:11 +0100 (Fri, 08 Jun 2007)
New Revision: 305

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

Fixes to setting the right localization



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2007-06-08 17:20:27 UTC (rev 304)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.Localize.sh	2007-06-08 17:56:11 UTC (rev 305)
@@ -122,10 +122,6 @@
 
 mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kdeglobals 
 
-sed -e "s/Text=Start/Text=${START}/g" /mnt/usr/share/skel/.kde/share/config/kickerrc  > /mnt/tmp/sed
-
-mv /mnt/tmp/sed /mnt/usr/share/skel/.kde/share/config/kickerrc
-
 #Change the root files
 sed -e "s/Country=C/Country=${COUNTRY}/g" /mnt/root/.kde/share/config/kdeglobals  > /mnt/tmp/sed
 
@@ -135,11 +131,6 @@
 
 mv /mnt/tmp/sed /mnt/root/.kde/share/config/kdeglobals 
 
-# Change the "Start" keyword for the launch button
-sed -e "s/Text=Start/Text=${START}/g" /mnt/root/.kde/share/config/kickerrc  > /mnt/tmp/sed
-
-mv /mnt/tmp/sed /mnt/root/.kde/share/config/kickerrc
-
 #Change KDM Langs
 
 sed -e "s/Language=en_US/Language=${SETKDMLANG}/g" /mnt/usr/local/share/config/kdm/kdmrc > /mnt/tmp/sed
@@ -163,11 +154,6 @@
 
   mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kdeglobals 
 
-# Change the "Start" keyword for the launch button
-  sed -e "s/Text=Start/Text=${START}/g" /mnt/usr/home/${i}/.kde/share/config/kickerrc > /mnt/tmp/sed
-
-  mv /mnt/tmp/sed /mnt/usr/home/${i}/.kde/share/config/kickerrc
-
   fi
 done
 

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-06-08 17:20:27 UTC (rev 304)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-06-08 17:56:11 UTC (rev 305)
@@ -4,17 +4,17 @@
 
 # Make sure they keyboard layout is saved
 XF86_CFG="/mnt/PCBSD/xorg-gui/templates/xorg.conf.header"
-XF86_TMP_CFG="/mnt/tmp/xorg.conf"
+XF86_TMP_CFG="/mnt/xorg.conf.tmp"
 
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
-rm -f ${XF86_TMP_CFG}
+#rm -f ${XF86_TMP_CFG}
 
 if [ "${1}" = "br" ]
 then
 
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
-rm -f ${XF86_TMP_CFG}
+#rm -f ${XF86_TMP_CFG}
 
 fi