From fe8f9763e00a90d9b16d09cd557428431888096b Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 23 Sep 2013 10:12:18 -0700 Subject: Update server data for changed binary names --- char-server | 4 +++- login-server | 4 +++- map-server | 4 +++- run-all | 8 ++++---- tools/bin/restart-login | 2 +- tools/bin/restart-world | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/char-server b/char-server index 9d6848f5..9b508cbb 100755 --- a/char-server +++ b/char-server @@ -1,4 +1,6 @@ -#!/bin/sh +#!/bin/bash +echo -e '\e[5;7;31mPlease update your build of TMWA, then use ./run-all\e[m' >& 2 +sleep 10 cd world && exec char-server diff --git a/login-server b/login-server index 52180e50..283c8631 100755 --- a/login-server +++ b/login-server @@ -1,4 +1,6 @@ -#!/bin/sh +#!/bin/bash +echo -e '\e[5;7;31mPlease update your build of TMWA, then use ./run-all\e[m' >& 2 +sleep 10 cd login && exec login-server diff --git a/map-server b/map-server index 0e870128..2534e979 100755 --- a/map-server +++ b/map-server @@ -1,4 +1,6 @@ -#!/bin/sh +#!/bin/bash +echo -e '\e[5;7;31mPlease update your build of TMWA, then use ./run-all\e[m' >& 2 +sleep 10 cd world/map && exec map-server diff --git a/run-all b/run-all index a6a58f82..cbfb749d 100755 --- a/run-all +++ b/run-all @@ -1,10 +1,10 @@ -#!/bin/sh +#!/bin/bash SELF=$(realpath $(which "$0")) cd "$(dirname "$SELF")" trap 'kill %1 %2 %3' SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM -./login-server & -./char-server & -./map-server & +( cd login && tmwa-login ) & +( cd world && tmwa-char ) & +( cd world/map && tmwa-map ) & wait diff --git a/tools/bin/restart-login b/tools/bin/restart-login index 765fe248..ebb5fe17 100755 --- a/tools/bin/restart-login +++ b/tools/bin/restart-login @@ -1,3 +1,3 @@ #!/bin/bash -e cd "$1" -restart-pid login-server +restart-pid tmwa-login diff --git a/tools/bin/restart-world b/tools/bin/restart-world index 7fead17f..ccd9e453 100755 --- a/tools/bin/restart-world +++ b/tools/bin/restart-world @@ -24,5 +24,5 @@ then (cd world/map/conf; cat magic.conf.template | ./spells-build > magic.conf) fi -restart-pid char-server -restart-pid map-server +restart-pid tmwa-char +restart-pid tmwa-map -- cgit v1.2.3-60-g2f50