diff --git a/fcitx.changes b/fcitx.changes index bb1fc14..3d40ec6 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Aug 10 14:19:20 UTC 2015 - i@marguerite.su + +- fix boo#941052: /etc/X11/xim is broken: input methods + (Fcitx, IBus and etc) do not start at all +- fix bashism in xim.d-fcitx + * "return 0" can only be used in function or sourcing, + so define functions + * "type -p" command is not available in sh builtins, + change to "-x" + * other minor stuff + ------------------------------------------------------------------- Sat May 30 17:22:00 UTC 2015 - Led diff --git a/xim.d-fcitx b/xim.d-fcitx index f292a65..49eb0e7 100644 --- a/xim.d-fcitx +++ b/xim.d-fcitx @@ -1,6 +1,16 @@ -if ! type -p fcitx > /dev/null 2>&1 ; then - echo "fcitx is not installed. please run `sudo zypper in fcitx`." - return 1 +function failure +{ + return 1 +} + +function success +{ + return 0 +} + +if ! [ -x /usr/bin/fcitx ] ; then + echo "fcitx is not installed. please 'sudo zypper in fcitx'." + $failure fi #make sure set these vars before dbus-launch @@ -13,11 +23,11 @@ export QT_IM_MODULE=fcitx export QT4_IM_MODULE=fcitx # Avoid relying on autolaunch to improvise D-Bus sessions for each process -if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then - eval `dbus-launch --sh-syntax --exit-with-session` +if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] ; then + eval $(dbus-launch --sh-syntax --exit-with-session) fi fcitx -d # success: -return 0 +$success