Fix 80ubuntu-xmodmap in tdebase on Debian and Ubuntu

12 years ago · fb019470a7
parent 72ac3a0a08
commit fb019470a7
5 changed files with 15 additions and 5 deletions
--- a/debian/lenny/tdebase/debian/80ubuntu-xmodmap
+++ b/debian/lenny/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
--- a/debian/squeeze/tdebase/debian/80ubuntu-xmodmap
+++ b/debian/squeeze/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
--- a/debian/wheezy/tdebase/debian/80ubuntu-xmodmap
+++ b/debian/wheezy/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
--- a/ubuntu/maverick/tdebase/debian/80ubuntu-xmodmap
+++ b/ubuntu/maverick/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
--- 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