Author: soliton
Date: Sun May 24 00:24:45 2009
New Revision: 35851
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35851&view=rev
Log:
made use of the readlink command
Modified:
trunk/utils/mp-server/new_release
trunk/utils/mp-server/run_server
Modified: trunk/utils/mp-server/new_release
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/mp-server/new_release?rev=35851&r1=35850&r2=35851&view=diff
==============================================================================
--- trunk/utils/mp-server/new_release (original)
+++ trunk/utils/mp-server/new_release Sun May 24 00:24:45 2009
@@ -8,7 +8,7 @@
[ "$1" = "-n" ] && { echo=echo; shift; }
[ $1 -ge 1 ] || die "New version must be greater than 1!"
-DEV_VERSION=1.5
+DEV_VERSION=$(readlink $HOME/servers/dev)
NEW_VERSION=$DEV_VERSION.$1
PREV_VERSION=$DEV_VERSION.$(($1-1))
PPREV_VERSION=$DEV_VERSION.$(($1-2))
Modified: trunk/utils/mp-server/run_server
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/mp-server/run_server?rev=35851&r1=35850&r2=35851&view=diff
==============================================================================
--- trunk/utils/mp-server/run_server (original)
+++ trunk/utils/mp-server/run_server Sun May 24 00:24:45 2009
@@ -66,8 +66,8 @@
[ -x bin/wesnothd-$SERVER ] || die "Executable 'bin/wesnothd-$SERVER'
not found."
DATE=$(date +"%Y%m%d-%H%M%S")
- [ ! -f "$SERVERBASE"/redirect.cfg ] || PORT=$(sed -nre '/port=/s/[
\t]*port="?([0-9]+)"?/\1/p' "$SERVERBASE"/redirect.cfg)
- BUILDDIR=$(ls -ld "$SERVERBASE"/build | sed -nre
's,.*(\.\./builds/wesnothd-[^ ]+/),\1,p')
+ [ -r "$SERVERBASE"/redirect.cfg ] && PORT=$(sed -nre '/port=/s/[
\t]*port="?([0-9]+)"?/\1/p' "$SERVERBASE"/redirect.cfg)
+ BUILDDIR=$(readlink "$SERVERBASE"/build)
REV=r$(echo $BUILDDIR | sed -nre
"s,.*wesnothd-svn-([0-9:SM]+)_$SERVER/$,\1,p")
LOG="wesnothd.$DATE.$REV.log"
bin/wesnothd-$SERVER -c "$SERVERBASE"/wesnothd.cfg --port $PORT
--threads $THREADS $PARAMETERS > "$SERVERBASE/logs/$LOG" 2>&1 &
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
