pool/x11-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 313359 from home:WernerFink:branches:X11:Utilities

Browse Source 
- 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
This commit is contained in:
Ondřej Súkup 2015-06-24 07:30:30 +00:00 committed by Git OBS Bridge
parent a32b4d268a
commit 5fdf076f52
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11-tools.changes
View File

@ -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 Tue Jun 23 12:40:55 UTC 2015 - werner@suse.de
- Allow background processes in ~/.profile and ~/.login (bsc#934720) - Xim script: Allow background processes in ~/.profile and ~/.login
also use ~/.i18n of exist instead of ~/.profile or ~/.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> Tue Nov 04 22:55:00 UTC 2014 - Led <ledest@gmail.com>

14
xim
View File

@ -65,10 +65,10 @@ adduserenv () {
local cur var=${1+"$@"} local cur var=${1+"$@"}
: ${HOSTNAME:=$(hostname -f)} : ${HOSTNAME:=$(hostname -f)}
# Use ~/.i18n # 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." echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.i18n."
eval $(set +u +e 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 for cur in $var; do
echo export $cur=${!cur} echo export $cur=${!cur}
done) done)
@ -83,8 +83,9 @@ adduserenv () {
(echo . "'$HOME/.profile' < /dev/null > /dev/null 2>&1" (echo . "'$HOME/.profile' < /dev/null > /dev/null 2>&1"
echo "set +u +e" echo "set +u +e"
for cur in $var; do for cur in $var; do
echo echo \${$cur+"export $cur=\$$cur";} echo echo \${$cur+"$cur=\$$cur;"}
done) | $SHELL) done
echo echo export $var) | $SHELL)
fi fi
;; ;;
*/csh|*/tcsh) */csh|*/tcsh)
@ -95,8 +96,9 @@ adduserenv () {
echo source "'$HOME/.login' < /dev/null >& /dev/null" echo source "'$HOME/.login' < /dev/null >& /dev/null"
echo unset verbose echo unset verbose
for cur in $var; do for cur in $var; do
echo if \( \${?$cur} \) echo export $cur=\`printenv $cur\` echo if \( \${?$cur} \) echo $cur=\`printenv $cur\`
done) | $SHELL) done
echo echo export $var) | $SHELL)
fi fi
;; ;;
esac esac