From 944255ff21cfd0e6f044547017d9864a6887f48e Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Mon, 2 Apr 2007 13:00:27 +0000
Subject: [PATCH] Fix errors on build servers other than build.eclipse.org

---
 .../bin/doit_irsbuild.sh                      | 24 ++++++-----
 .../org.eclipse.rse.build/bin/doit_nightly.sh | 42 ++++++++++---------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
index 6782b67ff43..989b63d5a06 100755
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
@@ -73,17 +73,19 @@ echo "Running the builder..."
 ./nightly.sh ${mapTag} ${buildType} ${buildId} >> $log 2>&1
 tail -50 $log
 
-#update the main download and archive pages
-cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
-cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
+#update the main download and archive pages: build.eclipse.org only
+if [ -d /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads ]; then
+  cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
+  cvs -q update -RPd >> $log 2>&1
+  chgrp dsdp-tmadmin * CVS/*
+  cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
+  cvs -q update -RPd >> $log 2>&1
+  chgrp dsdp-tmadmin * CVS/*
 
-#Fixup permissions and group id on download.eclpse.org (just to be safe)
-chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
-chmod -R g+w drops/${buildType}*${daystamp}*
+  #Fixup permissions and group id on download.eclpse.org (just to be safe)
+  chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
+  chmod -R g+w drops/${buildType}*${daystamp}*
+fi
 
 #Check the publishing
 cd $HOME/ws2/publish
@@ -104,7 +106,7 @@ if [ -f package.count -a "$FILES" != "" ]; then
     ${mydir}/batch_sign.sh `pwd`
   fi
 
-  if [ ${buildType} != M ]; then
+  if [ ${buildType} != M -a -d ../N.latest ]; then
     #update the doc server
     rm -f ../N.latest/RSE-SDK-*.zip
     cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
index a01ba052c31..b3132f6436b 100755
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
@@ -46,29 +46,33 @@ echo "Running the builder..."
 ./nightly.sh >> $log 2>&1
 tail -50 $log
 
-#update the main download and archive pages
-cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
-cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
-cvs -q update -RPd >> $log 2>&1
-chgrp dsdp-tmadmin * CVS/*
+#update the main download and archive pages: build.eclipse.org only
+if [ -d /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads ]; then
+  cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads
+  cvs -q update -RPd >> $log 2>&1
+  chgrp dsdp-tmadmin * CVS/*
+  cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads
+  cvs -q update -RPd >> $log 2>&1
+  chgrp dsdp-tmadmin * CVS/*
 
-#Fixup permissions and group id on download.eclpse.org (just to be safe)
-chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
-chmod -R g+w drops/${buildType}*${daystamp}*
+  #Fixup permissions and group id on download.eclpse.org (just to be safe)
+  chgrp -R dsdp-tmadmin drops/${buildType}*${daystamp}*
+  chmod -R g+w drops/${buildType}*${daystamp}*
+fi
 
 #Copy latest SDK in order to give access to DOC server
 cd $HOME/ws2/publish
-FILES=`ls N${daystamp}*/RSE-SDK-N${daystamp}*.zip 2>/dev/null`
-echo "FILES=$FILES"
-if [ "$FILES" != "" ]; then
-  rm N.latest/RSE-SDK-N*.zip
-  cp N${daystamp}*/RSE-SDK-N${daystamp}*.zip N.latest
-  cd N.latest
-  mv -f RSE-SDK-N${daystamp}*.zip RSE-SDK-latest.zip
-  chgrp dsdp-tmadmin RSE-SDK-latest.zip
-  chmod g+w RSE-SDK-latest.zip
+if [ -d N.latest ]; then
+  FILES=`ls N${daystamp}*/RSE-SDK-N${daystamp}*.zip 2>/dev/null`
+  echo "FILES=$FILES"
+  if [ "$FILES" != "" ]; then
+    rm N.latest/RSE-SDK-N*.zip
+    cp N${daystamp}*/RSE-SDK-N${daystamp}*.zip N.latest
+    cd N.latest
+    mv -f RSE-SDK-N${daystamp}*.zip RSE-SDK-latest.zip
+    chgrp dsdp-tmadmin RSE-SDK-latest.zip
+    chmod g+w RSE-SDK-latest.zip
+  fi
 fi
 
 #Cleanup old nightly builds (leave only last 5 in place)