From c5be92a7fcffcba4860999542131b9ffd2cecb98 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 21 Sep 2014 10:03:48 +0200 Subject: [PATCH] fix preview scripts to auto-checkout master --- s/cron/previews.sh | 12 ++++++------ s/preview | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/s/cron/previews.sh b/s/cron/previews.sh index 0d74640c6..7c9f8bb95 100644 --- a/s/cron/previews.sh +++ b/s/cron/previews.sh @@ -1,9 +1,9 @@ #!/bin/sh - -cd $ERESSEA/git -s/preview build -s/preview version +[ -z $ERESSEA ] && ERESSEA=$HOME/eressea +SRC=$ERESSEA/git +$SRC/s/preview build master +$SRC/s/preview version for game in 2 3 4 ; do - s/preview -g $game run && \ - s/preview -g $game send + $SRC/s/preview -g $game run && \ + $SRC/s/preview -g $game send done diff --git a/s/preview b/s/preview index a8893cc11..b22b34e76 100755 --- a/s/preview +++ b/s/preview @@ -23,6 +23,7 @@ function build() { assert_dir $SOURCE cd $SOURCE git pull || abort "failed to update source. do you have local changes?" +[ -z $1 ] || git checkout $1 s/build || abort "build failed." } @@ -87,7 +88,9 @@ zip="$turn-$1.zip" zip -q -u $zip $turn-$1.?r email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//') echo "sending reports to $1 / $email" -cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email +info=/dev/null +[ -e ../email.txt ] && info=../email.txt +cat $info | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $game Partei $1" -a $zip -- $email } game=0 @@ -128,7 +131,8 @@ case "$1" in version ;; "build") - build + shift + build $* ;; "setup") setup