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

Accepting request 259716 from home:Ledest:misc

Browse Source 
fix bashisms

OBS-URL: https://build.opensuse.org/request/show/259716
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=26
This commit is contained in:
Stefan Dirsch 2014-11-05 17:14:06 +00:00 committed by Git OBS Bridge
parent 99b3136c3b
commit d3702857be
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11-tools.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Nov 04 22:55:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashsisms in xf86debug script more correctly
-------------------------------------------------------------------
Sun Oct 19 20:46:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashsisms
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 22 15:52:48 UTC 2014 - fcrozat@suse.com Fri Aug 22 15:52:48 UTC 2014 - fcrozat@suse.com

2
xf86debug
View File

@ -27,7 +27,7 @@ ulimit -c unlimited
corefile=`mktemp /tmp/core.Xorg.XXXXXXXXXX` corefile=`mktemp /tmp/core.Xorg.XXXXXXXXXX`
echo -n "Starting X Server in Debugger ... " echo -n "Starting X Server in Debugger ... "
gdb << EOF &> $tmpfile gdb <<EOF > $tmpfile 2>&1
file /usr/bin/Xorg file /usr/bin/Xorg
set args ${1+"$@"} set args ${1+"$@"}
handle SIGUSR1 nostop handle SIGUSR1 nostop

20
xim
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# #
# $Id: xim,v 1.28 2004/12/07 11:04:59 mfabian Exp $ # $Id: xim,v 1.28 2004/12/07 11:04:59 mfabian Exp $
# #
@ -124,9 +124,9 @@ fi
# command line before using startx. In that case, don't # command line before using startx. In that case, don't
# read the system wide default from /etc/sysconfig/language, # read the system wide default from /etc/sysconfig/language,
# use the user supplied value instead: # use the user supplied value instead:
if [ "$INPUT_METHOD" == "" ] ; then if [ -z "$INPUT_METHOD" ] ; then
echo "sourcing /etc/sysconfig/language to get the value of INPUT_METHOD" echo "sourcing /etc/sysconfig/language to get the value of INPUT_METHOD"
source /etc/sysconfig/language . /etc/sysconfig/language
fi fi
if [ "$INPUT_METHOD" != "" ]; then if [ "$INPUT_METHOD" != "" ]; then
@ -134,8 +134,8 @@ if [ "$INPUT_METHOD" != "" ]; then
echo "Trying to start this user selected input method first ..." echo "Trying to start this user selected input method first ..."
if [ -r "/etc/X11/xim.d/$INPUT_METHOD" ] ; then if [ -r "/etc/X11/xim.d/$INPUT_METHOD" ] ; then
echo "sourcing /etc/X11/xim.d/$INPUT_METHOD" echo "sourcing /etc/X11/xim.d/$INPUT_METHOD"
source /etc/X11/xim.d/$INPUT_METHOD . /etc/X11/xim.d/$INPUT_METHOD
if [ "$?" == "0" ]; then if [ "$?" = "0" ]; then
echo "Start of $INPUT_METHOD succeeded." echo "Start of $INPUT_METHOD succeeded."
gnome_ibus_workaround $INPUT_METHOD gnome_ibus_workaround $INPUT_METHOD
return 0; return 0;
@ -169,8 +169,8 @@ for subdir in $subdirlist ; do
for im in /etc/X11/xim.d/$subdir/* ; do for im in /etc/X11/xim.d/$subdir/* ; do
if [ -r $im ] ; then if [ -r $im ] ; then
echo "sourcing $im ..." echo "sourcing $im ..."
source $im . $im
if [ "$?" == "0" ]; then if [ "$?" = "0" ]; then
echo "$im started sucessfully" echo "$im started sucessfully"
gnome_ibus_workaround $im gnome_ibus_workaround $im
return 0 return 0
@ -183,7 +183,7 @@ for subdir in $subdirlist ; do
fi fi
done done
if [ "$im_failed" == 0 ] ; then if [ "$im_failed" = 0 ] ; then
echo "There is no default input method for the current locale." echo "There is no default input method for the current locale."
else else
echo "All default input methods tried for the current locale failed." echo "All default input methods tried for the current locale failed."
@ -193,6 +193,4 @@ fi
# the dummy input method "none" to get reasonable default settings # the dummy input method "none" to get reasonable default settings
# of the relevant environment variables: # of the relevant environment variables:
source /etc/X11/xim.d/none . /etc/X11/xim.d/none

2
xim.template
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# #
# Copyright © 2001 SUSE LINUX GmbH Nuernberg, Germany # Copyright © 2001 SUSE LINUX GmbH Nuernberg, Germany
# #