accept some selected changes from stm2's script rewrite.

This commit is contained in:
Enno Rehling 2020-06-27 16:59:16 +02:00
parent 515fcb3c86
commit 45ec4b56df
4 changed files with 31 additions and 14 deletions

View File

@ -1,23 +1,31 @@
# What is this?
This repository contains the source code for the Play-by-Mail strategy game [Eressea](http://www.eressea.de/).
This repository contains the source code for the Play-by-Mail
strategy game [Eressea](http://www.eressea.de/).
# Prerequisites
Eressea depends on a number of external libraries. On a recent Debian-based Linux system, this is the apt-get command to install all of them:
Eressea depends on a number of external libraries. On a recent
Debian-based Linux system, this is the apt-get command to
install all of them:
sudo apt-get install git cmake gcc make libxml2-dev liblua5.2-dev libtolua-dev libncurses5-dev libsqlite3-dev luarocks
sudo apt-get install git cmake gcc make luarocks libxml2-dev \
liblua5.2-dev libtolua-dev libncurses5-dev libsqlite3-dev
# How to check out and build the Eressea server
This repository relies heavily on the use of submodules, and it pulls in most of the code from those. The build system being used is cmake, which can create Makefiles on Unix, or Visual Studio project files on Windows. Here's how you clone and build the source on Ubuntu:
This repository relies heavily on the use of submodules, and it pulls in
most of the code from those. The build system being used is cmake, which
can create Makefiles on Unix, or Visual Studio project files on Windows.
Here's how you clone and build the source on Linux or macOS:
git clone --recursive git://github.com/eressea/server.git
cd server
./configure
./s/build
git clone --recursive git://github.com/eressea/server.git source
cd source
git submodule update --init
s/build
If you got this far and all went well, you have built a server (it is linked from the `game` subdirectory), and it will have passed some basic functionality tests.
If you got this far and all went well, you have built the server, and
it will have passed some basic functionality tests.
* [![Static Analysis](https://scan.coverity.com/projects/6742/badge.svg?flat=1)](https://scan.coverity.com/projects/6742/)
* [![Build Status](https://api.travis-ci.org/eressea/server.svg?branch=develop)](https://travis-ci.org/eressea/server)

View File

@ -15,7 +15,7 @@ template="""#!/bin/bash
addr=%(email)s
[ $# -ge 1 ] && addr=$1
[ -z $addr ] || send-%(compression)s-report $addr '%(gamename)s Report #%(turn)s' %(files)s
[ -z $addr ] || $ERESSEA/server/bin/send-%(compression)s-report $addr '%(gamename)s Report #%(turn)s' %(files)s
"""
turn = argv[1]

View File

@ -5,8 +5,10 @@ if [ -z "$ERESSEA" ]; then
exit 2
fi
BINDIR="$ERESSEA/server/bin"
GAME="$ERESSEA/game-$1"
GAME_NAME=$(grep -w name "$GAME/eressea.ini" | sed 's/.*=\s*//')
GAME_NAME=$("$BINDIR/inifile" "$GAME/eressea.ini" get game:name)
TURN=$2
if [ -z "$TURN" ]
@ -20,6 +22,6 @@ if [ ! -d "$GAME/reports" ]; then
fi
cd "$GAME/reports" || exit
"$ERESSEA/server/bin/compress.py" "$TURN" "$GAME_NAME"
"$BINDIR/compress.py" "$TURN" "$GAME_NAME"
cd - || exit

View File

@ -5,11 +5,18 @@
# this here script to make a non-blocking syntax check and reject or
# accept the order file.
if [ "yes" != "$CONFIRM" ] ; then
if [ "no" == "$CONFIRM" ] ; then
exit
fi
if [ -z "$ERESSEA" ] ; then
ERESSEA="$HOME/eressea"
echo "The ERESSEA environment variable is not set. Assuming $ERESSEA."
fi
cd $ERESSEA
for GAME in $*
do
$HOME/eressea/orders-php/check-orders.sh $GAME
orders-php/check-orders.sh $GAME
done