summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-01-04 23:06:30 +0000
committerpascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-01-04 23:06:30 +0000
commitaf1ae9306f9ab66e93d7efbc704d08ac23258777 (patch)
tree0922293c65f07327ccf1ceb316752cfa24ddb331
parent866b9f8e7399aa4ee686ba1f4c9106d9629fc050 (diff)
Abbruch bei fehlendem numlockx ist nicht nötig
git-svn-id: https://svn.neo-layout.org@1368 b9310e46-f624-0410-8ea1-cfbb3a30dc96
-rwxr-xr-xlinux/bin/asdf14
1 files changed, 10 insertions, 4 deletions
diff --git a/linux/bin/asdf b/linux/bin/asdf
index f12f304..0c3ab46 100755
--- a/linux/bin/asdf
+++ b/linux/bin/asdf
@@ -40,6 +40,12 @@ die() {
exit 1
}
+numlock_manually() {
+ echo "$1"
+ echo "Please turn Numlock $2 and press ›Enter‹ to continue."
+ read
+}
+
set_xmodmap() {
if [ -e "${PATH_XMODMAP}" ]; then
if [ -f "$@" ]; then
@@ -87,15 +93,15 @@ if [ -z ${DISPLAY} ]; then
set_keymap "${NEO_CONSOLE_KEYMAP}"
if [ -e "${PATH_SETLEDS}" ]; then
- "${PATH_SETLEDS}" +num || die "Failed to set NUM status."
+ "${PATH_SETLEDS}" +num || numlock_manually "Failed to set NUM status." on
else
- die "setleds does not exist, cannot set NUM status."
+ numlock_manually "setleds does not exist, cannot set NUM status." on
fi
else
if [ -e "${PATH_NUMLOCKX}" ]; then
- "${PATH_NUMLOCKX}" off || die "Failed to turn off Numlock."
+ "${PATH_NUMLOCKX}" off || numlock_manually "Failed to turn off Numlock." off
else
- die "numlockx not found, cannot turn off Numlock."
+ numlock_manually "numlockx not found, cannot turn off Numlock." off
fi
if [ -e "${PATH_XSET}" ]; then