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

[svn at pcbsd.org]

Author: kris
Date: 2007-07-17 18:35:00 +0100 (Tue, 17 Jul 2007)
New Revision: 507

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

Fixed bug with not saving keyboard layout properly, now br will use abnt2



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-07-17 17:06:13 UTC (rev 506)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SaveKeyboard.sh	2007-07-17 17:35:00 UTC (rev 507)
@@ -2,41 +2,42 @@
 
 KEYMAP="${1}"
 
+HEADERS="xorg.conf.generic
+ati.xorg.conf
+ati-3d-enable.xorg.conf
+intel.xorg.conf
+intel-3d-enable.xorg.conf
+nvidia-100.14.11.xorg.conf
+nvidia-7184.xorg.conf
+nvidia-9746.xorg.conf"
+
+
+
 # Make sure they keyboard layout is saved
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/xorg.conf.generic"
+for i in $HEADERS
+do
+
+XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/${i}"
 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}
 
-# Do the intel header now
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/header/i810.xorg.conf"
-cp ${XF86_CFG} ${XF86_TMP_CFG}
-sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
-rm -f ${XF86_TMP_CFG}
+done
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/conf/xorg.conf.basic"
-cp ${XF86_CFG} ${XF86_TMP_CFG}
-sed "s/\"us\"/\"${KEYMAP}\"/" < ${XF86_TMP_CFG} > ${XF86_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}
+for i in $HEADERS
+do
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/xorg.conf.generic"
+XF86_CFG="/mnt/PCBSD/xorg-gui/templates/${i}"
 cp ${XF86_CFG} ${XF86_TMP_CFG}
 sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
 rm -f ${XF86_TMP_CFG}
 
-XF86_CFG="/mnt/PCBSD/xorg-gui/templates/i810.xorg.conf"
-cp ${XF86_CFG} ${XF86_TMP_CFG}
-sed "s/\"pc105\"/\"abnt2\"/" < ${XF86_TMP_CFG} > ${XF86_CFG}
-rm -f ${XF86_TMP_CFG}
+done
 
-
 fi