From: Stephan Stahl Date: Tue, 30 Mar 2010 20:55:57 +0000 (+0000) Subject: rm'd further nex-havoc references X-Git-Tag: xonotic-v0.1.0preview~519^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=2ec7592650fe8ad01d877f7c6887d9f9dda143af rm'd further nex-havoc references replace nex with xonotic in a lot of places --- diff --git a/havoc/default.cfg b/havoc/default.cfg deleted file mode 100644 index e87c29e4..00000000 --- a/havoc/default.cfg +++ /dev/null @@ -1 +0,0 @@ -exec defaultHavoc.cfg diff --git a/nexuiz-linux-glx.sh b/nexuiz-linux-glx.sh deleted file mode 100755 index f99704be..00000000 --- a/nexuiz-linux-glx.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -path=`dirname "${0}"` -link=`readlink "${0}"` - -[ -n "${link}" ] && path=`dirname "${link}"` -cd "${path}" - -case "${0##*/}" in - *sdl*) mode="sdl" ;; - *) mode="glx" ;; -esac - -case "$(uname -m)" in - x86_64) arch="x86_64" ;; - *) arch="686" ;; -esac - -nexuiz="nexuiz-linux-${arch}-${mode}" - -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 "$@" diff --git a/nexuiz-linux-sdl.sh b/nexuiz-linux-sdl.sh deleted file mode 120000 index 1e3c60fb..00000000 --- a/nexuiz-linux-sdl.sh +++ /dev/null @@ -1 +0,0 @@ -nexuiz-linux-glx.sh \ No newline at end of file diff --git a/readme.html b/readme.html index c55926df..6625a3bd 100644 --- a/readme.html +++ b/readme.html @@ -4,9 +4,9 @@ - - -Nexuiz - A free open-source fast paced first person shooter (FPS) for Windows, Linux and OSX + + +Xonotic - A free open-source fast paced first person shooter (FPS) for Windows, Linux and OSX @@ -15,22 +15,22 @@