Generalize this script to remove the necessity of editing it every time

we create a new src branch.  While here, garbage collect some code that
hasn't been run for years.

1 files changed, 11 insertions, 13 deletions

diff --git a/Tools/portbuild/scripts/dologs b/Tools/portbuild/scripts/dologs
index 865b6887ffa6..54f1b773c88b 100755
--- a/Tools/portbuild/scripts/dologs
+++ b/Tools/portbuild/scripts/dologs
@@ -1,27 +1,25 @@
 #!/bin/sh
+# $FreeBSD$
 
-pb=/var/portbuild
 arch=$1
+versions="latest full"
+
+pb=/var/portbuild
 
 . ${pb}/${arch}/portbuild.conf
 
 home=${pb}/errorlogs
 scripts=${pb}/scripts
 
-for ver in latest full; do
-  for num in 6 6-exp 7 7-exp 8 8-exp; do
-    dir=$home/$arch-$num-$ver
+for version in ${versions}; do
+  for branch in ${branches}; do
+    dir=$home/$arch-$branch-$version
     test -d $dir && cd $dir && ${scripts}/processlogs ${arch}
-    dir=${pb}/${arch}/${num}
-    test -d $dir && cd $dir && ${scripts}/processfail ${arch} ${num}
+    dir=${pb}/${arch}/${branch}
+    test -d $dir && cd $dir && ${scripts}/processfail ${arch} ${branch}
   done
-  for num in 6 6-exp 7 7-exp 8 8-exp; do
-    dir=$home/$arch-$num-$ver-logs
+  for branch in ${branches}; do
+    dir=$home/$arch-$branch-$version-logs
     test -d $dir && cd $dir && ${scripts}/processlogs2
   done
-#  for num in 6 6-exp 7; do
-#    cd $home && ${scripts}/comparelogs ${arch} $num-$ver 4-$ver
-#    cd $home && ${scripts}/comparelogs ${arch} 4-$ver $num-$ver
-#  done
-#  cd $home && ${scripts}/bothlogs ${arch} 4-$ver 5-$ver
 done