summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-12-15 16:09:02 +0100
committerSlávek Banko <slavek.banko@axis.cz>2012-12-15 16:09:02 +0100
commitfb019470a78a0a6edec57f491b4b8244a6ea85a8 (patch)
tree979cabd4b7b41ffe0919938a42525bb823b017be /ubuntu/precise
parent72ac3a0a08befd4b584baedf0222076cdc5243c8 (diff)
downloadtde-packaging-fb019470a78a0a6edec57f491b4b8244a6ea85a8.tar.gz
tde-packaging-fb019470a78a0a6edec57f491b4b8244a6ea85a8.zip
Fix 80ubuntu-xmodmap in tdebase on Debian and Ubuntu
Diffstat (limited to 'ubuntu/precise')
-rw-r--r--ubuntu/precise/tdebase/debian/80ubuntu-xmodmap4
1 files changed, 3 insertions, 1 deletions
diff --git a/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap b/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap
index 27a318d73..7774dd9b8 100644
--- a/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap
+++ b/ubuntu/precise/tdebase/debian/80ubuntu-xmodmap
@@ -2,11 +2,13 @@
#
# This file is sourced by Xsession(5), not executed.
# The "|| true" is to ensure that the Xsession script does not terminate on error
-/usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true
USRMODMAP="$HOME/.Xmodmap"
if [ -x /usr/bin/xmodmap ]; then
+ if [ -f /usr/share/apps/kxkb/ubuntu.xmodmap ]; then
+ /usr/bin/xmodmap /usr/share/apps/kxkb/ubuntu.xmodmap || true
+ fi
if [ -f "$USRMODMAP" ]; then
/usr/bin/xmodmap "$USRMODMAP" || true
fi