--- trunk/dbus/30-dbus	2013/08/13 14:26:09	2253
+++ trunk/dbus/30-dbus	2013/08/16 07:34:35	2254
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 # launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval `$dbuslaunch --sh-syntax --exit-with-session`
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type -P dbus-launch
+then
+  eval $(dbus-launch --sh-syntax --exit-with-session)
 fi
-