--- /usr/bin/startkde 2014-04-09 16:32:32.532297920 +0200 +++ /usr/bin/startkde 2014-04-09 16:36:15.788297894 +0200 @@ -16,7 +16,7 @@ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading unset DYLD_FORCE_FLAT_NAMESPACE -qdbus="QT_SELECT=qt4 qdbus" +export QT_SELECT=qt4 # Check if a KDE session already is running and whether it's possible to connect to X kcheckrunning @@ -314,7 +314,7 @@ if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then eval `dbus-launch --sh-syntax --exit-with-session` fi -if $qdbus >/dev/null 2>/dev/null; then +if qdbus >/dev/null 2>/dev/null; then : # ok else echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 @@ -418,13 +418,13 @@ # wait for remaining drkonqi instances with timeout (in seconds) wait_drkonqi_timeout=`kreadconfig --file startkderc --group WaitForDrKonqi --key Timeout --default 900` wait_drkonqi_counter=0 - while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do + while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do sleep 5 wait_drkonqi_counter=$((wait_drkonqi_counter+5)) if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then # ask remaining drkonqis to die in a graceful way - $qdbus | grep 'org.kde.drkonqi-' | while read address ; do - $qdbus "$address" "/MainApplication" "quit" + qdbus | grep 'org.kde.drkonqi-' | while read address ; do + qdbus "$address" "/MainApplication" "quit" done break fi