From: MirceaKitsune Date: Mon, 4 Oct 2010 00:32:36 +0000 (+0300) Subject: Update .sh files X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d712624f8f48b33415d3d3327d73988907b14e0d;p=voretournament%2Fvoretournament.git Update .sh files --- 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 diff --git a/voretournament-linux-sdl.sh b/voretournament-linux-sdl.sh index 53391637..41f63aaf 100644 --- a/voretournament-linux-sdl.sh +++ b/voretournament-linux-sdl.sh @@ -1 +1 @@ -link voretournament-linux-glx.sh \ No newline at end of file +xonotic-linux-glx.sh \ No newline at end of file