unfunction is_yes(), moved faster conditions to the front

diff --git a/dbus-daemon-1-profile.d-sh b/dbus-daemon-1-profile.d-sh
index 5b572f047b914607572f027a756eee3df0dadf36..45fec817fc8cb4cd93cec7345a6ed42f2abdb5d5 100644 (file)
--- a/dbus-daemon-1-profile.d-sh
+++ b/dbus-daemon-1-profile.d-sh
@@ -1,9 +1,11 @@
 #! /bin/sh
 
+[ -x /usr/bin/dbus-launch -a -f /var/run/dbus.pid ] || return
+
 # Get configuration
 . /etc/sysconfig/messagebus
 
-# Take from rc-scripts
+# Taken from rc-scripts
 is_yes()
 {
        # Check value
@@ -19,12 +21,8 @@ is_yes()
        esac
 }
 
-if is_yes "${SESSION_BUS_PROFILE_D}"; then
-    if [ -f /usr/bin/dbus-launch ]; then
-       if [ -f /var/run/dbus.pid ]; then
-           if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-               eval `dbus-launch --sh-syntax --exit-with-session`
-           fi    
-       fi
-    fi
-fi
\ No newline at end of file
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && is_yes "${SESSION_BUS_PROFILE_D}"; then
+       eval `dbus-launch --sh-syntax --exit-with-session`
+fi
+
+unset -f is_yes

diff --git a/dbus-xinitrc.sh b/dbus-xinitrc.sh
index e1abd0f70178c4c9c01244ccdd518f799af4fdd7..a321dc0081ff1e2826f894b854c63d4e3b3f515f 100644 (file)
--- a/dbus-xinitrc.sh
+++ b/dbus-xinitrc.sh
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+[ -x /usr/bin/dbus-launch -a -f /var/run/dbus.pid ] || return
+
 # Get configuration
 . /etc/sysconfig/messagebus
 
@@ -19,12 +21,8 @@ is_yes()
        esac
 }
 
-if is_yes "${SESSION_BUS_X_SESSION}"; then
-    if  [ -f /usr/bin/dbus-launch ]; then
-       if [ -f /var/run/dbus.pid ]; then
-           if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-               eval `dbus-launch --sh-syntax --exit-with-session`
-           fi    
-       fi
-    fi
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && is_yes "${SESSION_BUS_X_SESSION}"; then
+       eval `dbus-launch --sh-syntax --exit-with-session`
 fi
+
+unset -f is_yes