From 065a55502cbe936102a285bf858e2263f9e5eaa8 Mon Sep 17 00:00:00 2001
From: pascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Tue, 7 Oct 2008 23:02:32 +0000
Subject: der Aufruf asdf [Variante] funktioniert wieder. Es gilt die
 Reihenfolge 1) angegebenen Parameter 2) Config-file 3) default

git-svn-id: https://svn.neo-layout.org@958 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 linux/bin/asdf | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'linux')

diff --git a/linux/bin/asdf b/linux/bin/asdf
index 38d8ec7..f1bd4e3 100755
--- a/linux/bin/asdf
+++ b/linux/bin/asdf
@@ -26,13 +26,14 @@ PATH_XSET=${PATH_XSET:-/usr/bin/xset}
 
 # Default values
 NEO_X_VARIANTE=${NEO_X_VARIANTE:-xkbmap}
+NEO_X_VARIANTE=${1-$NEO_X_VARIANTE}
 NEO_XKBMAP=${NEO_XKBMAP:-de}
 NEO_XKBVARIANT=${NEO_XKBVARIANT:-neo}
-NEO_XMODMAP="${NEO_XMODMAP:-$HOME/neo/neo_de.xmodmap}"
-NEO_XMODMAP_XPROG="${NEO_XMODMAP:-$HOME/neo/neo_de_x-prog.xmodmap}"
-NEO_XMODMAP_ALTERNATIVE="${NEO_XMODMAP:-$HOME/neo/neo_de_alternative.xmodmap}"
-NEO_XMODMAP_EVDEV="${NEO_XMODMAP:-$HOME/neo/neo_de_evdev.xmodmap}"
-NEO_CONSOLE_KEYMAP="${NEO_CONSOLE_KEYMAP:-$HOME/neo/neo}" # for $HOME/neo/neo.map (without the „.map“)
+NEO_XMODMAP=${NEO_XMODMAP:-$HOME/neo/neo_de.xmodmap}
+NEO_XMODMAP_XPROG=${NEO_XMODMAP_XPROG:-$HOME/neo/neo_de_x-prog.xmodmap}
+NEO_XMODMAP_ALTERNATIVE=${NEO_XMODMAP_ALTERNATIVE:-$HOME/neo/neo_de_alternative.xmodmap}
+NEO_XMODMAP_EVDEV=${NEO_XMODMAP_EVDEV:-$HOME/neo/neo_de_evdev.xmodmap}
+NEO_CONSOLE_KEYMAP=${NEO_CONSOLE_KEYMAP:-$HOME/neo/neo} # for $HOME/neo/neo.map (without the „.map“)
 
 die() {
 	echo "$@" >&2
-- 
cgit v1.2.3