cleanup after use

[infrastructure.git] / scripts / all-modules.sh

diff --git a/scripts/all-modules.sh b/scripts/all-modules.sh
index a48cdd2..aa230f5 100755 (executable)
--- a/scripts/all-modules.sh
+++ b/scripts/all-modules.sh
@@ -8,10 +8,10 @@
 
 OUTPUT=/build/modules
 
-# usage: do_version name dir 
+# usage: do_version dir name 
 function do_version () {
-    name=$1; shift
     build_dir=$1; shift
+    name=$1; shift
 
     out_dir=$OUTPUT/$name
     out_file=$out_dir/version.txt
@@ -22,17 +22,17 @@ function do_version () {
     ( echo $name ; \
       date ; \
       $build_dir/module-version -a ; \
-      date ) > $out_tmp
+      date ) &> $out_tmp
     mv -f $out_tmp $out_file
 }
 
-# usage: do_version name dir 
+# usage: do_version dir name 
 function do_diff () {
-    name=$1; shift
     build_dir=$1; shift
+    name=$1; shift
 
     out_dir=$OUTPUT/$name
-    out_file=$out_dir/version.txt
+    out_file=$out_dir/diff.txt
     out_tmp=$out_file.new
     
     mkdir -p $out_dir
@@ -40,14 +40,16 @@ function do_diff () {
     ( echo $name ; \
       date ; \
       $build_dir/module-diff -a -o -q ; \
-      date ) > $out_tmp
+      date ) &> $out_tmp
 
     ( echo 'WARNINGS (if any)' ; \
       egrep 'was not found|Skipping failed' $out_tmp ;
       cat $out_tmp ) > $out_file
+
+    rm -f $out_tmp
 }
 
-do_version trunk /root/svn-build
-do_diff    trunk /root/svn-build
-do_version 4.2 /root/svn-build-4.2
-do_diff    4.2 /root/svn-build-4.2
+do_version /root/svn-build-4.2 4.2 
+do_diff    /root/svn-build-4.2 4.2 
+do_version /root/svn-build     trunk 
+do_diff    /root/svn-build     trunk