X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=buildd%2Fjenkins-link_latest.sh;h=68aed46affcff11e133ec7ee08079b7a24451267;hb=b0f14af53e9c397e5809583f9d69fd804e9d08bc;hp=67be538518d3444f93280435dbc6c269ae8ede84;hpb=082aac8a2fb271ad75b18ca2c5d19112c33b54de;p=grml-live.git

diff --git a/buildd/jenkins-link_latest.sh b/buildd/jenkins-link_latest.sh
index 67be538..68aed46 100755
--- a/buildd/jenkins-link_latest.sh
+++ b/buildd/jenkins-link_latest.sh
@@ -1,33 +1,35 @@
 #!/bin/bash
-set -e
-. /etc/grml/grml-buildd.conf
 
+MIRROR_DIRECTORY=$1
 if [ -z "$MIRROR_DIRECTORY" ] ; then
-  echo "Error: \$MIRROR_DIRECTORY is not set. Exiting." >&2
+  echo "Usage: jenkins-link_latest.sh path_to_public_directory flavour1 ... flavourN" >&2
   exit 1
 fi
+shift
 
-if [ -z "$FLAVOURS" ] ; then
-  echo "Error: \$FLAVOURS is not set. Exiting." >&2
-  exit 2
-fi
+FLAVOURS=$*
+
+JOBS=/var/lib/jenkins/jobs
 
 cd $MIRROR_DIRECTORY || exit 1
 for f in $FLAVOURS; do
-  rm -r ./$f
-  rm ./$f*.iso*
+  [ -d $JOBS/$f/builds ] || continue
+  [ -d ./$f ] && rm -r ./$f
   mkdir $f
-  for buildpath in /var/lib/jenkins/jobs/$f/builds/*_*; do
+  for buildpath in $JOBS/$f/builds/*_*; do
     build=$(basename $buildpath)
     mkdir $f/$build
-    for isofile in $buildpath/archive/iso/*; do
-      ln -s $isofile $f/$build/
+    for isofile in $buildpath/archive/grml_isos/*; do
+      [ -e $isofile ] && ln -s $isofile $f/$build/
     done
-    ln -s $buildpath/archive/logs $f/$build/logs
+    [ -d $buildpath/archive/grml_logs ] && ln -s $buildpath/archive/grml_logs $f/$build/logs
   done
-  latest=$(basename $(readlink /var/lib/jenkins/jobs/$f/lastStable))
-  ln -s $f/$latest/*.iso ${f}_latest.iso
-  ln -s $f/$latest/*.iso.md5 ${f}_latest.iso.md5
-  ln -s $f/$latest/*.iso.sha1 ${f}_latest.iso.sha1
+  latest=$(basename $(readlink $JOBS/$f/lastSuccessful))
+  mkdir ${f}/latest
+  if [ -e $f/$latest/*.iso ]; then
+    latestname=$(basename ${f}/$latest/*.iso)
+    ln -s ../$latest/${latestname} ${f}/latest/${f}_latest.iso
+    ln -s ../$latest/${latestname}.md5 ${f}/latest/${f}_latest.iso.md5
+    ln -s ../$latest/${latestname}.sha1 ${f}/latest/${f}_latest.iso.sha1
+  fi
 done
-