X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=voretournament-linux-glx.sh;h=020970497116e080a5a0946a88473139f953b8cd;hp=b5b05c35b75edd1af1f820d568766179c3244624;hb=b3e529335687c563c04ef02c5f8059663715bf88;hpb=cc148bf19700d380a18d7f51a706f9bbe959811b

diff --git a/voretournament-linux-glx.sh b/voretournament-linux-glx.sh
index b5b05c35..02097049 100644
--- a/voretournament-linux-glx.sh
+++ b/voretournament-linux-glx.sh
@@ -12,13 +12,13 @@ case "${0##*/}" in
 esac
 
 case "$(uname -m)" in
-  x86_64)	arch="x86_64" ;;
-  *)		arch="686" ;;
+  x86_64)	arch="linux64" ;;
+  *)		arch="linux32" ;;
 esac
 
-voretournament="voretournament-linux-${arch}-${mode}"
+xonotic="xonotic-${arch}-${mode}"
 
-set -- ./${voretournament} "${@}"
+set -- ./${xonotic} "${@}"
 
 xserver=
 xlayout=
@@ -43,14 +43,14 @@ setdisplay()
 }
 
 # now how do we execute it?
-if [ -r ~/.voretournament/data/config.cfg ]; then
+if [ -r ~/.xonotic/data/config.cfg ]; then
 	while read -r CMD KEY VALUE; do
 		case "$CMD:$KEY" in
 			seta:vid_x11_display)
 				setdisplay "$VALUE"
 				;;
 		esac
-	done < ~/.voretournament/data/config.cfg
+	done < ~/.xonotic/data/config.cfg
 fi
 
 m=0
@@ -88,10 +88,10 @@ case "$xserver" in
 			# X server already exists
 			export DISPLAY=:$xserver
 			prefix="DISPLAY=:$xserver "
-			msg=$msg$lf"- Running VoreTournament on already existing display :$xserver"
+			msg=$msg$lf"- Running Xonotic on already existing display :$xserver"
 		else
 			set -- startx "$@" -fullscreen -- ":$xserver"
-			msg=$msg$lf"- Running VoreTournament on a newly created X server :$xserver."
+			msg=$msg$lf"- Running Xonotic on a newly created X server :$xserver."
 			case "$xlayout" in
 				'')
 					;;
@@ -111,7 +111,7 @@ case "$xserver" in
 		echo "Resulting command line:"
 		echo "  $prefix$*"
 		echo
-		echo "To undo these overrides, edit ~/.voretournament/data/config.cfg and remove the line"
+		echo "To undo these overrides, edit ~/.xonotic/data/config.cfg and remove the line"
 		echo "starting with 'seta vid_x11_display'."
 		echo
 		echo