cosmetic

[infrastructure.git] / scripts / nightly-build-vserver.sh

diff --git a/scripts/nightly-build-vserver.sh b/scripts/nightly-build-vserver.sh
index 863131b..2ab5312 100755 (executable)
--- a/scripts/nightly-build-vserver.sh
+++ b/scripts/nightly-build-vserver.sh
@@ -14,8 +14,8 @@ DEFAULT_MAILTO_planetlab="devel@planet-lab.org"
 DEFAULT_MAILTO_onelab="onelab-build@one-lab.org"
 
 # web publishing results
-WEBPATH=/build/@DISTRO@/@BUILD@
-WEBLOG=/build/@DISTRO@/@BUILD@.txt
+WEBPATH=/build/@PLDISTRO@/@BASE@
+WEBLOG=/build/@PLDISTRO@/@BASE@.txt
 
 # for the test part
 TESTBUILDURL="http://build.one-lab.org/"
@@ -253,6 +253,7 @@ function main () {
        # The log inside the vserver contains everything
        LOG2=/vservers/${BASE}/build/build-log.txt
        (echo "==================== Transcript of vserver creation" ; cat $LOG ; echo "==================== End of vserver creation") >> $LOG2
+       echo "==================== See next stages in $LOG2" >> $LOG
        # redirect log again
        exec >> $LOG2 2>&1 
 
@@ -262,8 +263,8 @@ function main () {
        vserver ${BASE} exec /$COMMAND "${argv[@]}"
 
        # publish
-       webpath=$(echo $WEBPATH | sed -e s,@DISTRO@,"$PLDISTRO",g -e s,@BUILD@,"$BASE",g)
-       weblog=$(echo $WEBLOG | sed -e s,@DISTRO@,"$PLDISTRO",g -e s,@BUILD@,"$BASE",g)
+       webpath=$(echo $WEBPATH | sed -e s,@PLDISTRO@,"$PLDISTRO",g -e s,@BASE@,"$BASE",g)
+       weblog=$(echo $WEBLOG | sed -e s,@PLDISTRO@,"$PLDISTRO",g -e s,@BASE@,"$BASE",g)
        rm -f $webpath
        ln -s /vservers/$BASE/build $webpath
        rm -f $weblog