X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=xonotic-linux-glx.sh;h=4ef3d03030318a37fe05ba54b6ae3a3a62b56bfd;hp=5461a4cc196b5cfed3901c11907eb815a7c83b6f;hb=737b6e2b75fae9b158cfb064d71a980be1c3004d;hpb=5d21c011d874c70159ac70f2e4435c57c16a9c3e

diff --git a/xonotic-linux-glx.sh b/xonotic-linux-glx.sh
index 5461a4cc..4ef3d030 100755
--- a/xonotic-linux-glx.sh
+++ b/xonotic-linux-glx.sh
@@ -1,22 +1,23 @@
 #!/bin/sh
 
 path=`dirname "${0}"`
-link=`readlink "${0}"`
+link=`readlink -f "${0}"`
 
 [ -n "${link}" ] && path=`dirname "${link}"`
 cd "${path}"
 
 case "${0##*/}" in
+  *dedicated*)	mode="dedicated" ;;
   *sdl*)	mode="sdl" ;;
   *)		mode="glx" ;;
 esac
 
 case "$(uname -m)" in
-  x86_64)	arch="x86_64" ;;
-  *)		arch="686" ;;
+  x86_64)	arch="linux64" ;;
+  *)		arch="linux32" ;;
 esac
 
-xonotic="xonotic-linux-${arch}-${mode}"
+xonotic="xonotic-${arch}-${mode}"
 
 set -- ./${xonotic} "${@}"
 
@@ -118,4 +119,13 @@ case "$xserver" in
 		;;
 esac
 
+# if pulseaudio
+if [ -z "$SDL_AUDIODRIVER" ]; then
+	if ps -C pulseaudio >/dev/null; then
+		if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+			export SDL_AUDIODRIVER=pulse
+		fi
+	fi
+fi
+
 exec "$@"