Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ennorehling/eressea into develop

This commit is contained in:
Enno Rehling 2019-05-26 20:13:34 +02:00
parent 0e888c264f e6b84410b9
commit c0113987db
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
process/backup-eressea
View File

@ -4,6 +4,13 @@ if [ -z $ERESSEA ] ; then
echo "The ERESSEA environment variable is not set. Assuming $ERESSEA."
fi
GAME=$1
upload() {
SRC="$1"
DST=$(basename "$SRC")
echo put "$SRC" "$DST" | cadaver "https://dav.box.com/dav/Eressea/game-$GAME/"
}
if [ ! -d $ERESSEA/game-$GAME ]; then
echo "No such game: game-$GAME."
exit 1
@ -26,7 +33,7 @@ fi
if [ -e reports/reports.txt ] ; then
echo "backup reports $TURN, game $GAME"
tar cjf backup/$TURN-reports.tar.bz2 reports
curl -s -n -T backup/$TURN-reports.tar.bz2 https://dav.box.com/dav/Eressea/game-$GAME/$TURN-reports.tar.bz2
upload backup/$TURN-reports.tar.bz2
fi
files="data/$TURN.dat parteien.full parteien"
if [ -e orders.$TURN ]; then
@ -34,5 +41,5 @@ files="$files orders.$TURN"
fi
echo "backup turn $TURN, game $GAME, files: $files"
tar cjf backup/$TURN.tar.bz2 $files
curl -s -n -T backup/$TURN.tar.bz2 https://dav.box.com/dav/Eressea/game-$GAME/$TURN.tar.bz2
#curl -s -n -T eressea.db https://dav.box.com/dav/Eressea/eressea.db
upload backup/$TURN.tar.bz2

2
src/kernel/version.c
View File

@ -8,7 +8,7 @@
#ifndef ERESSEA_VERSION
/* the version number, if it was not passed to make with -D */
#define ERESSEA_VERSION "3.20.0"
#define ERESSEA_VERSION "3.21.0"
#endif
const char *eressea_version(void) {