From 7c33715fc725f1e666accbaa9f41005d86032c34 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 7 Mar 2013 11:34:47 +0100
Subject: [PATCH] simpler name scheme for version and diff output

---
 scripts/all-modules.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/scripts/all-modules.sh b/scripts/all-modules.sh
index 94a0246..77259b2 100755
--- a/scripts/all-modules.sh
+++ b/scripts/all-modules.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# feb 2013 - mainline is now known as 5.2, remove that step in the output
+# meaning results are now in merely
+# http://build.onelab.eu/modules/version.html
+#
 # reviewed in dec. 2010
 # moving back to running on the EU side
 # 
@@ -15,6 +19,7 @@ COMMAND=$(basename $0)
 
 # running as root on liquid
 OUTPUT=/build/modules
+WWWNAME=mainline
 LOCK=~/all-modules.run
 # make sure the cyclic tasks do not interfere with manual usage
 # (i.e. do not use ~/modules)
@@ -39,33 +44,31 @@ function do_update() {
     fi
 }
 
-# usage: do_version dir workdir wwwname 
+# usage: do_version dir workdir 
 function do_version () {
     build_dir=$1; shift
     workdir=$1; shift
-    wwwname=$1; shift
 
-    out_dir=$OUTPUT/$wwwname
+    out_dir=$OUTPUT
     out_file=$out_dir/version.html
     out_tmp=$out_dir/.version.html
     
     mkdir -p $out_dir
-    $build_dir/module-version $VERBOSE -w $workdir --www $wwwname -a &> $out_tmp
+    $build_dir/module-version $VERBOSE -w $workdir --www $WWWNAME -a &> $out_tmp
     mv -f $out_tmp $out_file
 }
 
-# usage: do_version dir workdir wwwname 
+# usage: do_diff dir workdir
 function do_diff () {
     build_dir=$1; shift
     workdir=$1; shift
-    wwwname=$1; shift
 
-    out_dir=$OUTPUT/$wwwname
+    out_dir=$OUTPUT
     out_file=$out_dir/diff.html
     out_tmp=$out_dir/.diff.html
     
     mkdir -p $out_dir
-    $build_dir/module-diff $VERBOSE -w $workdir --www $wwwname -a &> $out_tmp
+    $build_dir/module-diff $VERBOSE -w $workdir --www $WWWNAME -a &> $out_tmp
     mv -f $out_tmp $out_file
 
 }
@@ -100,8 +103,8 @@ function main () {
     echo $$ > $LOCK
 
     do_update  ~/git-build
-    do_version ~/git-build     $WORKDIR_GIT 5.0 
-    do_diff    ~/git-build     $WORKDIR_GIT 5.0
+    do_version ~/git-build     $WORKDIR_GIT 
+    do_diff    ~/git-build     $WORKDIR_GIT 
 
     rm $LOCK
 
-- 
2.43.0