[arch-commits] Commit in pulseaudio/trunk (pulseaudio.xinit)

[Jan Steffens]

    Date: Thursday, September 29, 2011 @ 14:36:43
  Author: heftig
Revision: 139114

try to fix xinit

Modified:
  pulseaudio/trunk/pulseaudio.xinit

------------------+
 pulseaudio.xinit |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Modified: pulseaudio.xinit
===================================================================
--- pulseaudio.xinit	2011-09-29 14:24:25 UTC (rev 139113)
+++ pulseaudio.xinit	2011-09-29 18:36:43 UTC (rev 139114)
@@ -1,7 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
-case "$SESSION" in
-  GNOME|KDE*|xfce4) # PulseAudio is started via XDG Autostart
+run=0
+
+case "$DESKTOP_SESSION" in
+  gnome|kde*|xfce4) # PulseAudio is started via XDG Autostart
   ;;
-  *) /usr/bin/start-pulseaudio-x11 ;;
+  *) 
+    run=1
 esac
+
+# Catch KDE again, which might not set DESKTOP_SESSION correctly
+[[ -z $KDE_FULL_SESSION ]] && run=0
+
+(( run )) && /usr/bin/start-pulseaudio-x11