r2163 - branches/nexuiz-2.0
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Feb 6 09:07:41 EST 2007
Author: esteel
Date: 2007-02-06 09:07:40 -0500 (Tue, 06 Feb 2007)
New Revision: 2163
Added:
branches/nexuiz-2.0/nexuiz-linux-sdl.sh
Removed:
branches/nexuiz-2.0/nexuiz-linux-sdl.sh
Modified:
branches/nexuiz-2.0/nexuiz-linux-glx.sh
Log:
merged nexuiz-linux-*.sh changes from trunk
Modified: branches/nexuiz-2.0/nexuiz-linux-glx.sh
===================================================================
--- branches/nexuiz-2.0/nexuiz-linux-glx.sh 2007-02-06 13:50:48 UTC (rev 2162)
+++ branches/nexuiz-2.0/nexuiz-linux-glx.sh 2007-02-06 14:07:40 UTC (rev 2163)
@@ -6,11 +6,18 @@
[ -n "${link}" ] && path="`dirname \"${link}\"`"
cd "${path}"
+case "${0##*/}" in
+ *sdl*) mode="sdl" ;;
+ *) mode="glx" ;;
+esac
+
case "$(uname -m)" in
- x86_64) nexuiz="nexuiz-linux-x86_64-glx" ;;
- *) nexuiz="nexuiz-linux-686-glx" ;;
+ x86_64) arch="x86_64" ;;
+ *) arch="686" ;;
esac
+nexuiz="nexuiz-linux-${arch}-${mode}"
+
set -- ./${nexuiz} "${@}"
xserver=
Deleted: branches/nexuiz-2.0/nexuiz-linux-sdl.sh
===================================================================
--- branches/nexuiz-2.0/nexuiz-linux-sdl.sh 2007-02-06 13:50:48 UTC (rev 2162)
+++ branches/nexuiz-2.0/nexuiz-linux-sdl.sh 2007-02-06 14:07:40 UTC (rev 2163)
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-path="`dirname \"${0}\"`"
-link="`readlink \"${0}\"`"
-
-[ -n "${link}" ] && path="`dirname \"${link}\"`"
-cd "${path}"
-
-case "$(uname -m)" in
- x86_64) nexuiz="nexuiz-linux-x86_64-sdl" ;;
- *) nexuiz="nexuiz-linux-686-sdl" ;;
-esac
-
-set -- ./${nexuiz} "${@}"
-
-xserver=
-xlayout=
-
-setdisplay()
-{
- VALUE=$1
- VALUE=${VALUE#\"}
- VALUE=${VALUE%\"}
- case "$VALUE" in
- :*)
- ;;
- *)
- VALUE=:$VALUE
- ;;
- esac
- VALUE="$VALUE/"
- xserver="${VALUE%%/*}"
- xserver=${xserver#:}
- xlayout=${VALUE#*/}
- xlayout=${xlayout%/}
-}
-
-# now how do we execute it?
-if [ -r ~/.nexuiz/data/config.cfg ]; then
- while read -r CMD KEY VALUE; do
- case "$CMD:$KEY" in
- seta:vid_x11_display)
- setdisplay "$VALUE"
- ;;
- esac
- done < ~/.nexuiz/data/config.cfg
-fi
-
-m=0
-for X in "$@"; do
- case "$m:$X" in
- 0:+vid_x11_display)
- m=1
- ;;
- 0:+vid_x11_display\ *)
- setdisplay "${X#+vid_x11_display }"
- ;;
- 1:*)
- setdisplay "$X"
- m=0
- ;;
- *)
- ;;
- esac
-done
-
-case "$xserver" in
- '')
- ;;
- *[!0-9]*)
- echo "Not using display ':$xserver': evil characters"
- ;;
- *)
- msg=
- lf='
-'
- prefix=
-
- # check for a listening X server on that socket
- if netstat -nl | grep -F " /tmp/.X11-unix/X$xserver" >/dev/null; then
- # X server already exists
- export DISPLAY=:$xserver
- prefix="DISPLAY=:$xserver "
- msg=$msg$lf"- Running Nexuiz on already existing display :$xserver"
- else
- set -- startx "$@" -fullscreen -- ":$xserver"
- msg=$msg$lf"- Running Nexuiz on a newly created X server :$xserver."
- case "$xlayout" in
- '')
- ;;
- *[!A-Za-z0-9]*)
- echo >&2 "Not using layout '$xlayout': evil characters"
- xlayout=
- ;;
- *)
- set -- "$@" -layout "$xlayout"
- msg=$msg$lf"- Using the ServerLayout section named $xlayout."
- ;;
- esac
- fi
-
- echo "X SERVER OVERRIDES IN EFFECT:$msg"
- echo
- echo "Resulting command line:"
- echo " $prefix$*"
- echo
- echo "To undo these overrides, edit ~/.nexuiz/data/config.cfg and remove the line"
- echo "starting with 'seta vid_x11_display'."
- echo
- echo
- ;;
-esac
-
-exec "$@"
Added: branches/nexuiz-2.0/nexuiz-linux-sdl.sh
===================================================================
--- branches/nexuiz-2.0/nexuiz-linux-sdl.sh (rev 0)
+++ branches/nexuiz-2.0/nexuiz-linux-sdl.sh 2007-02-06 14:07:40 UTC (rev 2163)
@@ -0,0 +1 @@
+link nexuiz-linux-glx.sh
\ No newline at end of file
Property changes on: branches/nexuiz-2.0/nexuiz-linux-sdl.sh
___________________________________________________________________
Name: svn:special
+ *
Name: svn:executable
+ *
More information about the nexuiz-commits
mailing list