diff --git a/conf/eressea.ini b/conf/eressea.ini index c745631ad..aed9c219c 100644 --- a/conf/eressea.ini +++ b/conf/eressea.ini @@ -1,5 +1,5 @@ [game] -email = eressea-server@kn-bremen.de +email = eressea-server@example.com sender = Eressea Server name = Eressea report = reports diff --git a/process/send-bz2-report b/process/send-bz2-report index f4b2ad6ea..2282a9f24 100755 --- a/process/send-bz2-report +++ b/process/send-bz2-report @@ -16,7 +16,7 @@ then shift fi -if [ "$1" == "-Lde" ] +if [ "$1" == "-Len" ] then TEMPLATE=report-mail.en.txt shift diff --git a/process/sendreport.sh b/process/sendreport.sh index 93d52f0b4..be643ef56 100755 --- a/process/sendreport.sh +++ b/process/sendreport.sh @@ -1,7 +1,5 @@ #!/bin/bash -## this script takes a backup of a turn. -## usage: backup.sh if [ -z $ERESSEA ]; then echo "You have to define the \$ERESSEA environment variable to run $0" diff --git a/s/install b/s/install index 5115ca8ee..cf72362c8 100755 --- a/s/install +++ b/s/install @@ -10,7 +10,7 @@ done if [ "$FORCE" != "yes" ] ; then BRANCH=$(git status -s -b | head -1 | cut -d\ -f 2 | sed 's/\..*//') if [ "$BRANCH" != "master" ] ; then - echo "you should only install stable versions from the master branch" + echo "You should only install stable versions from the master branch. Use -f to override." exit fi fi diff --git a/s/setup b/s/setup index adf4e0b85..77097d024 100755 --- a/s/setup +++ b/s/setup @@ -11,9 +11,9 @@ done ERESSEA=$(dirname $ROOT) function abort() { -echo $1 -[ -z $2 ] && exit -1 -exit $2 # otherwise + echo $1 + [ -z $2 ] && exit -1 + exit $2 # otherwise } function usage() { @@ -63,34 +63,36 @@ if [ -d $dir ] ; then [ $force -eq 1 ] || abort "$dir directory exists. Use -f to force" fi mkdir -p $dir -cd $dir || abort "could not chdir to game-$game" +cd $dir || abort "could not chdir to $dir" mkdir -p data reports function ini_sec() { -if [ $edit -eq 1 ]; then -$INIFILE eressea.ini add $1 -else -echo "[$1]" >> eressea.ini -fi + if [ $edit -eq 1 ]; then + $INIFILE eressea.ini add $1 + else + echo "[$1]" >> eressea.ini + fi } + function ini_add() { -if [ $edit -eq 1 ]; then -$INIFILE eressea.ini add $1:$2 $3 -else -echo "$2 = $3" >> eressea.ini -fi + if [ $edit -eq 1 ]; then + $INIFILE eressea.ini add $1:$2 $3 + else + echo "$2 = $3" >> eressea.ini + fi } + function ini_start() { -if [ -e eressea.ini ]; then -if [ ! -e $INIFILE ] && [ $edit -eq 1 ]; then -abort "missing editor for eressea.ini. use -n to create new file." -fi -rm -f eressea.ini -edit=0 -else -edit=0 -fi -touch eressea.ini + if [ -e eressea.ini ]; then + if [ ! -e $INIFILE ] && [ $edit -eq 1 ]; then + abort "missing editor for eressea.ini. use -n to create new file." + fi + rm -f eressea.ini + edit=0 + else + edit=0 + fi + touch eressea.ini } ini_start diff --git a/scripts/run-turn.lua b/scripts/run-turn.lua index 83d4045ac..34c1ea4fb 100644 --- a/scripts/run-turn.lua +++ b/scripts/run-turn.lua @@ -29,7 +29,7 @@ local function dbupdate() update_scores() if config.dbname then dbname = config.basepath..'/'..config.dbname - edb = db.open(dbame) + edb = db.open(dbname) if edb~=nil then edb:update_factions() edb:update_scores() diff --git a/src/gmtool.c b/src/gmtool.c index db556bb0a..30d80ba4a 100644 --- a/src/gmtool.c +++ b/src/gmtool.c @@ -859,7 +859,7 @@ static void select_regions(state * st, int selectmode) static void loaddata(state *st) { char datafile[MAX_PATH]; - askstring(st->wnd_status->handle, "save as:", datafile, sizeof(datafile)); + askstring(st->wnd_status->handle, "load from:", datafile, sizeof(datafile)); if (strlen(datafile) > 0) { readgame(datafile); st->modified = 0;