|
 |
545bfa |
From e8dab09d0f47c6030878c89e6db7168af9f7e009 Mon Sep 17 00:00:00 2001
|
|
|
545bfa |
From: Akira TAGOH <akira@tagoh.org>
|
|
|
545bfa |
Date: Wed, 10 Jan 2018 21:29:26 +0900
|
|
|
545bfa |
Subject: [PATCH 52/52] Fix unbound variable issue
|
|
|
545bfa |
|
|
|
545bfa |
---
|
|
|
545bfa |
data/xinput.sh.in.in | 2 +-
|
|
|
545bfa |
data/xinputinfo.sh.in | 2 +-
|
|
|
545bfa |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
545bfa |
|
|
|
545bfa |
diff --git a/data/xinput.sh.in.in b/data/xinput.sh.in.in
|
|
|
545bfa |
index e8e99ee..f56e57a 100755
|
|
|
545bfa |
--- a/data/xinput.sh.in.in
|
|
|
545bfa |
+++ b/data/xinput.sh.in.in
|
|
|
545bfa |
@@ -38,7 +38,7 @@ tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
|
|
|
545bfa |
# unset env vars to be safe
|
|
|
545bfa |
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
|
|
|
545bfa |
|
|
|
545bfa |
-[ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
545bfa |
+[ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
545bfa |
|
|
|
545bfa |
# migrate old configuration file
|
|
|
545bfa |
[ ! -d $CONFIGDIR ] && mkdir -p $CONFIGDIR || :
|
|
|
545bfa |
diff --git a/data/xinputinfo.sh.in b/data/xinputinfo.sh.in
|
|
|
545bfa |
index 9802392..2ce5b20 100755
|
|
|
545bfa |
--- a/data/xinputinfo.sh.in
|
|
|
545bfa |
+++ b/data/xinputinfo.sh.in
|
|
|
545bfa |
@@ -56,7 +56,7 @@ if [ $# -gt 0 ]; then
|
|
|
545bfa |
source $1
|
|
|
545bfa |
IMSETTINGS_FILENAME=$1
|
|
|
545bfa |
else
|
|
|
545bfa |
- [ -z "$IMSETTINGS_DISABLE_USER_XINPUTRC" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
545bfa |
+ [ -z "${IMSETTINGS_DISABLE_USER_XINPUTRC-}" ] && IMSETTINGS_DISABLE_USER_XINPUTRC=no
|
|
|
545bfa |
|
|
|
545bfa |
if [ -r "$USER_XINPUTRC" -a "x$IMSETTINGS_DISABLE_USER_XINPUTRC" = "xno" ]; then
|
|
|
545bfa |
source "$USER_XINPUTRC"
|
|
|
545bfa |
--
|
|
|
545bfa |
2.17.1
|
|
|
545bfa |
|