|
 |
29947e |
diff -pruN imsettings-1.6.3.orig/data/xinput.sh.in.in imsettings-1.6.3/data/xinput.sh.in.in
|
|
|
29947e |
--- imsettings-1.6.3.orig/data/xinput.sh.in.in 2019-02-25 08:11:22.623162201 +0000
|
|
|
29947e |
+++ imsettings-1.6.3/data/xinput.sh.in.in 2019-02-25 08:11:50.064154377 +0000
|
|
|
29947e |
@@ -38,7 +38,7 @@ tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8
|
|
|
29947e |
# unset env vars to be safe
|
|
|
29947e |
unset AUXILIARY_PROGRAM AUXILIARY_ARGS GTK_IM_MODULE ICON IMSETTINGS_IGNORE_ME LONG_DESC NOT_RUN PREFERENCE_PROGRAM PREFERENCE_ARGS QT_IM_MODULE SHORT_DESC XIM XIM_PROGRAM XIM_ARGS XMODIFIERS
|
|
|
29947e |
|
|
|
29947e |
-[ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
29947e |
+[ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
29947e |
|
|
|
29947e |
# migrate old configuration file
|
|
|
29947e |
[ ! -d $CONFIGDIR ] && mkdir -p $CONFIGDIR || :
|
|
|
29947e |
@@ -84,7 +84,7 @@ elif [ -r "$SYS_XINPUTRC" ]; then
|
|
|
29947e |
fi
|
|
|
29947e |
fi
|
|
|
29947e |
|
|
|
29947e |
-[ -z "$IMSETTINGS_INTEGRATE_DESKTOP" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes
|
|
|
29947e |
+[ -z "${IMSETTINGS_INTEGRATE_DESKTOP-}" ] && IMSETTINGS_INTEGRATE_DESKTOP=yes
|
|
|
29947e |
export IMSETTINGS_INTEGRATE_DESKTOP
|
|
|
29947e |
|
|
|
29947e |
[ -z "$XIM" ] && XIM=none
|
|
|
29947e |
diff -pruN imsettings-1.6.3.orig/data/xinputinfo.sh.in imsettings-1.6.3/data/xinputinfo.sh.in
|
|
|
29947e |
--- imsettings-1.6.3.orig/data/xinputinfo.sh.in 2012-12-13 08:36:42.000000000 +0000
|
|
|
29947e |
+++ imsettings-1.6.3/data/xinputinfo.sh.in 2019-02-25 08:11:36.839158001 +0000
|
|
|
29947e |
@@ -56,7 +56,7 @@ if [ $# -gt 0 ]; then
|
|
|
29947e |
source $1
|
|
|
29947e |
IMSETTINGS_FILENAME=$1
|
|
|
29947e |
else
|
|
|
29947e |
- [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
29947e |
+ [ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
29947e |
|
|
|
29947e |
if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
|
|
|
29947e |
source "$USER_XINPUTRC"
|