From 5fdf076f52718a93be18545b71e1e71499e2b465f909a30dddea1b4c934b831c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Wed, 24 Jun 2015 07:30:30 +0000
Subject: [PATCH] Accepting request 313359 from
 home:WernerFink:branches:X11:Utilities

- Xim script: Allow to simply touch an empty ~/.i18n to override
  ~/.profile or ~/.login. Also make sure that all bourne shells
  are able to export the variables like INPUT_METHOD.

- Xim script: Allow background processes in ~/.profile and ~/.login
  (bsc#934720) also use ~/.i18n of exist instead of ~/.profile or
  ~/.login

OBS-URL: https://build.opensuse.org/request/show/313359
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=29
---
 x11-tools.changes | 12 ++++++++++--
 xim               | 14 ++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/x11-tools.changes b/x11-tools.changes
index a831f29..6fc8fb7 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,8 +1,16 @@
+-------------------------------------------------------------------
+Wed Jun 24 07:22:49 UTC 2015 - werner@suse.de
+
+- Xim script: Allow to simply touch an empty ~/.i18n to override
+  ~/.profile or ~/.login. Also make sure that all bourne shells
+  are able to export the variables like INPUT_METHOD.
+
 -------------------------------------------------------------------
 Tue Jun 23 12:40:55 UTC 2015 - werner@suse.de
 
-- Allow background processes in ~/.profile and ~/.login (bsc#934720) 
-  also use ~/.i18n of exist instead of ~/.profile or ~/.login
+- Xim script: Allow background processes in ~/.profile and ~/.login
+  (bsc#934720) also use ~/.i18n of exist instead of ~/.profile or
+  ~/.login
 
 -------------------------------------------------------------------
 Tue Nov 04 22:55:00 UTC 2014 - Led <ledest@gmail.com>
diff --git a/xim b/xim
index ebb00f9..5cac093 100644
--- a/xim
+++ b/xim
@@ -65,10 +65,10 @@ adduserenv () {
     local cur var=${1+"$@"}
     : ${HOSTNAME:=$(hostname -f)}
     # Use ~/.i18n
-    if test -s "$HOME/.i18n"; then
+    if test -e "$HOME/.i18n"; then
 	echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.i18n."
 	eval $(set +u +e
-	       . /etc/profile.d/lang.sh
+	       . /etc/profile.d/lang.sh < /dev/null > /dev/null 2>&1
 	       for cur in $var; do
 		   echo export $cur=${!cur}
 	       done)
@@ -83,8 +83,9 @@ adduserenv () {
 		   (echo . "'$HOME/.profile' < /dev/null > /dev/null 2>&1"
 		    echo "set +u +e"
 		    for cur in $var; do
-			echo echo \${$cur+"export $cur=\$$cur";}
-		    done) | $SHELL)
+			echo echo \${$cur+"$cur=\$$cur;"}
+		    done
+		    echo echo export $var) | $SHELL)
 	fi
 	;;
     */csh|*/tcsh)
@@ -95,8 +96,9 @@ adduserenv () {
 		    echo source "'$HOME/.login' < /dev/null >& /dev/null"
 		    echo unset verbose
 		    for cur in $var; do
-			echo if \( \${?$cur} \) echo export $cur=\`printenv $cur\`
-		    done) | $SHELL)
+			echo if \( \${?$cur} \) echo $cur=\`printenv $cur\`
+		    done
+		    echo echo export $var) | $SHELL)
 	fi
 	;;
     esac