From 6a0c7851604b386e9781f2dceec516f53d4949b2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 4 Jun 2013 11:41:36 +0000 Subject: [PATCH] nightly/bin/nightly: Add support for running the nightly build against another branch than the trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4890 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/bin/nightly | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nightly/bin/nightly b/nightly/bin/nightly index 9a30636e6..173be30da 100755 --- a/nightly/bin/nightly +++ b/nightly/bin/nightly @@ -53,10 +53,11 @@ usage () { # Startup #---------------------------------------------------------------------------- +scst_rootdir="$(dirname "$(dirname "$(cd "$(dirname "$0")" && echo "$PWD")")")" if svn info . >/dev/null 2>&1; then - scst_repo="https://scst.svn.sourceforge.net/svnroot/scst/trunk" + scst_repo="$(svn info "$scst_rootdir" | sed -n 's/^URL: //p')" else - scst_repo="$(dirname "$(dirname "$(cd "$(dirname "$0")" && echo "$PWD")")")" + scst_repo="$scst_rootdir" fi sendmail_opts="" run_if_unchanged="false" @@ -220,5 +221,5 @@ fi # Use the conf/.sendmail script to email the results. conf/$ABT_MACHINE.sendmail \ ${sendmail_opts} \ - "$changed_str$ABT_START nightly build ($ABT_MACHINE, $ABT_DETAILS)" \ + "$changed_str$ABT_START $(basename "$scst_repo") nightly build ($ABT_MACHINE, $ABT_DETAILS)" \ final > sendmail.log 2>&1