Commit 7ae7d93e authored by Manuel's avatar Manuel

Fix merge error

parent 1f9b9268
......@@ -5,14 +5,14 @@
pkgname=chakra-init-live
pkgver=2013.02
pkgrel=4
pkgrel=5
pkgdesc="Live-session systemd startup scripts"
arch=('x86_64')
url="http://www.chakra-project.org"
license=('GPL2')
source=('live' 'locale_setup.sh')
md5sums=('e757dbe814a219709d616c146a7c26a9'
'08e837996c70e1002ae2f7bb292e0863')
'860161e5be1778bad7886bddab9dc39e')
package() {
cd ${srcdir}
......
......@@ -51,7 +51,7 @@ set_locale() {
echo "Section \"InputClass\"" >> /etc/X11/xorg.conf.d/10-keyboard.conf
echo " Identifier \"Keyboard Defaults\"" >> /etc/X11/xorg.conf.d/10-keyboard.conf
echo " MatchIsKeyboard \"yes\"" >> /etc/X11/xorg.conf.d/10-keyboard.conf
echo " Option \"XkbLayout\" \"${KBLAYOUT}\"" /etc/X11/xorg.conf.d/10-keyboard.conf
echo " Option \"XkbLayout\" \"${KBLAYOUT}\"" >> /etc/X11/xorg.conf.d/10-keyboard.conf
if [ "$KEYMAP" = "dvorak" ] ; then
echo " Option \"XkbVariant\" \"dvorak\"" >> /etc/X11/xorg.conf.d/10-keyboard.conf
fi
......@@ -68,4 +68,3 @@ set_locale() {
sed -i -r "s/#(en_US.*UTF-8)/\1/g" /etc/locale.gen
locale-gen
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment