From e9ccc248951d527c4a1e934896dcbd97f593b248 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 22 Aug 2014 07:44:52 +0200 Subject: [PATCH] make previews always build from master --- s/cron/previews.sh | 2 +- s/preview | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/s/cron/previews.sh b/s/cron/previews.sh index 91f0444fd..fc9f5f70b 100755 --- a/s/cron/previews.sh +++ b/s/cron/previews.sh @@ -1,6 +1,6 @@ #!/bin/bash -s/preview build +s/preview build master s/preview version for game in 2 3 4 ; do s/preview -g $game run && \ diff --git a/s/preview b/s/preview index 9db46f7cb..f5aebd818 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." } @@ -128,7 +129,8 @@ case "$1" in version ;; "build") - build + shift + build $* ;; "setup") setup