Date: Wednesday, December 5, 2012 @ 20:31:29 Author: dreisner Revision: 172790
cleanup dbus launch script Modified: dbus/trunk/30-dbus ---------+ 30-dbus | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Modified: 30-dbus =================================================================== --- 30-dbus 2012-12-06 01:26:17 UTC (rev 172789) +++ 30-dbus 2012-12-06 01:31:29 UTC (rev 172790) @@ -1,8 +1,6 @@ #!/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 dbus-launch >/dev/null; then + eval $(dbus-launch --sh-syntax --exit-with-session) fi