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

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

Browse source
This commit is contained in:
Enno Rehling 2019-05-26 20:13:34 +02:00
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." echo "The ERESSEA environment variable is not set. Assuming $ERESSEA."
fi fi
GAME=$1 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 if [ ! -d $ERESSEA/game-$GAME ]; then
echo "No such game: game-$GAME." echo "No such game: game-$GAME."
exit 1 exit 1
@ -26,7 +33,7 @@ fi
if [ -e reports/reports.txt ] ; then if [ -e reports/reports.txt ] ; then
echo "backup reports $TURN, game $GAME" echo "backup reports $TURN, game $GAME"
tar cjf backup/$TURN-reports.tar.bz2 reports 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 fi
files="data/$TURN.dat parteien.full parteien" files="data/$TURN.dat parteien.full parteien"
if [ -e orders.$TURN ]; then if [ -e orders.$TURN ]; then
@ -34,5 +41,5 @@ files="$files orders.$TURN"
fi fi
echo "backup turn $TURN, game $GAME, files: $files" echo "backup turn $TURN, game $GAME, files: $files"
tar cjf backup/$TURN.tar.bz2 $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 upload backup/$TURN.tar.bz2
#curl -s -n -T eressea.db https://dav.box.com/dav/Eressea/eressea.db

2
src/kernel/version.c
View file

@ -8,7 +8,7 @@
#ifndef ERESSEA_VERSION #ifndef ERESSEA_VERSION
/* the version number, if it was not passed to make with -D */ /* 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 #endif
const char *eressea_version(void) { const char *eressea_version(void) {