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

[svn at pcbsd.org]

Author: melkor
Date: 2008-05-27 04:22:35 -0700 (Tue, 27 May 2008)
New Revision: 1983

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

Fix localization in SetKeyboard.sh


Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2008-05-26 18:45:10 UTC (rev 1982)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SetKeyboard.sh	2008-05-27 11:22:35 UTC (rev 1983)
@@ -3,18 +3,28 @@
 # Configuration file
 . /usr/local/pcbsd/scripts/PCBSD.Config
 
-layout=$1
+if [ $1 = "us" ]
+then
+  layout="us"
+  options=''
+else
+  layout="us,${1}"
+  options="-rules xorg -option grp:ctrl_shift_toggle,ctrl:ctrl_aa,grp_led:scroll"
+fi
 model=$2
 variant=$3
 
 if [ "$variant" = "off" ]
 then
-  setxkbmap -model $model -layout $layout
+  VariantFlag=""
 else
-  setxkbmap -model $model -layout $layout -variant $variant
+  VariantFlag=" -variant $variant"
 fi
 
+setxkbmap -model $model -layout $layout $VariantFlag $options
+
 # Save the keyboard setup so the SaveKeyboard.sh script can later use values
 echo "$model" >/uzip/.keymodel
 echo "$layout" >/uzip/.keylayout
 echo "$variant" >/uzip/.keyvariant
+