From 3f835f188fddefa97dc0ab7f8009499a179f6f04 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Tue, 12 Dec 2006 16:07:05 +0000
Subject: [PATCH] Fix TM builds since sg is not supported on build.eclipse.org
 any more

---
 .../org.eclipse.rse.build/bin/batch_sign.sh   |  9 +++----
 .../org.eclipse.rse.build/bin/doit_ibuild.sh  | 15 ++++++-----
 .../bin/doit_irsbuild.sh                      | 19 +++++++-------
 .../org.eclipse.rse.build/bin/doit_nightly.sh | 11 ++++----
 .../org.eclipse.rse.build/bin/doit_sbuild.sh  | 25 +++++++++----------
 5 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/releng/org.eclipse.rse.build/bin/batch_sign.sh b/releng/org.eclipse.rse.build/bin/batch_sign.sh
index b091bd336bf..3f351726ec3 100755
--- a/releng/org.eclipse.rse.build/bin/batch_sign.sh
+++ b/releng/org.eclipse.rse.build/bin/batch_sign.sh
@@ -18,8 +18,7 @@
 #:#    batch_sign.sh publish/S-1.0M5-200611100500
 
 #nothing we do should be hidden from the world
-##newgrp dsdp-tm-rse # newgrp doesnt work from shellscripts -- use sg instead
-umask 2
+umask 22
 
 #Use Java5 on build.eclipse.org
 #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
@@ -44,7 +43,7 @@ fi
 #sign the zipfiles
 cd "$dirToSign"
 RDIR=`pwd`
-sg dsdp-tm-rse -c "mkdir -p signed"
+mkdir -p signed
 nameToSign=`basename $RDIR`
 ZIPS=`ls *.zip *.jar`
 STAGING=/home/data/httpd/download-staging.priv/dsdp/tm
@@ -66,8 +65,8 @@ while [ "$MISSING" != "" -a ${TRIES} -gt 0 ]; do
   for x in $MISSING ; do
     if [ -f ${STDIR}/out/$x ]; then
       echo "Done: TRIES=${TRIES}, $x"
-      sg dsdp-tm-rse -c "cp -f ${STDIR}/out/$x ${RDIR}/signed/$x"
-      sg dsdp-tm-rse -c "chmod ugo+r ${RDIR}/signed/$x"
+      cp -f ${STDIR}/out/$x ${RDIR}/signed/$x
+      chmod ugo+r ${RDIR}/signed/$x
     else
       MISSING_NEW="${MISSING_NEW} $x"
     fi
diff --git a/releng/org.eclipse.rse.build/bin/doit_ibuild.sh b/releng/org.eclipse.rse.build/bin/doit_ibuild.sh
index 589c831c3f8..1551725ff0a 100755
--- a/releng/org.eclipse.rse.build/bin/doit_ibuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_ibuild.sh
@@ -13,8 +13,7 @@
 #Will build based on HEAD of all mapfiles, and update the testUpdates as well
 
 #nothing we do should be hidden from the world
-##newgrp dsdp-tm-rse # newgrp doesnt work from shellscripts -- use sg instead
-umask 2
+umask 22
 
 #Use Java5 on build.eclipse.org
 #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
@@ -39,16 +38,16 @@ echo "Updating builder from CVS..."
 cd org.eclipse.rse.build
 stamp=`date +'%Y%m%d-%H%M'`
 log=$HOME/ws/log-I$stamp.txt
-sg dsdp-tm-rse -c "touch $log"
-sg dsdp-tm-rse -c "cvs -q update -RPd >> $log 2>&1"
+touch $log
+cvs -q update -RPd >> $log 2>&1
 daystamp=`date +'%Y%m%d-%H'`
 
 echo "Running the builder..."
-sg dsdp-tm-rse -c "./nightly.sh HEAD I >> $log 2>&1"
+./nightly.sh HEAD I >> $log 2>&1
 tail -50 $log
 
 #Fixup permissions and group id on download.eclpse.org (just to be safe)
-chmod -R g+w $HOME/ws/publish/I${daystamp}*
+#chmod -R g+w $HOME/ws/publish/I${daystamp}*
 
 #Copy latest SDK in order to give access to DOC server
 cd $HOME/ws/publish
@@ -63,10 +62,10 @@ fi
 
 #Update the testUpdates sites
 if [ "$FILES" != "" ]; then
-  sg dsdp-tm-rse -c "echo \"Refreshing update site\" "
+  echo "Refreshing update site"
   cd $HOME/downloads-tm/testUpdates/bin
   ./mkTestUpdates.sh
-  sg dsdp-tm-rse -c "echo \"Refreshing signedUpdates site\" "
+  echo "Refreshing signedUpdates site"
   cd $HOME/downloads-tm/signedUpdates/bin
   ./mkTestUpdates.sh
   cd "$curdir"
diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
index 9b6615c0eaa..7ec333a4687 100755
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
@@ -21,8 +21,7 @@
 #:#    doit_irsbuild.sh I
 
 #nothing we do should be hidden from the world
-##newgrp dsdp-tm-rse # newgrp doesnt work from shellscripts -- use sg instead
-umask 2
+umask 22
 
 #Use Java5 on build.eclipse.org
 #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
@@ -63,16 +62,16 @@ echo "Updating builder from CVS..."
 cd org.eclipse.rse.build
 stamp=`date +'%Y%m%d-%H%M'`
 log=$HOME/ws/log-${buildType}$stamp.txt
-sg dsdp-tm-rse -c "touch $log"
-sg dsdp-tm-rse -c "cvs -q update -RPd >> $log 2>&1"
+touch $log
+cvs -q update -RPd >> $log 2>&1
 daystamp=`date +'%Y%m%d*%H'`
 
 echo "Running the builder..."
-sg dsdp-tm-rse -c "./nightly.sh HEAD ${buildType} ${buildId} >> $log 2>&1"
+./nightly.sh HEAD ${buildType} ${buildId} >> $log 2>&1
 tail -50 $log
 
 #Fixup permissions and group id on download.eclpse.org (just to be safe)
-chmod -R g+w $HOME/ws/publish/${buildType}*${daystamp}*
+#chmod -R g+w $HOME/ws/publish/${buildType}*${daystamp}*
 
 #Check the publishing
 cd $HOME/ws/publish
@@ -95,14 +94,14 @@ if [ -f package.count -a "$FILES" != "" ]; then
   #update the doc server
   rm -f ../N.latest/RSE-SDK-*.zip
   cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip
-  chmod g+w ../N.latest/RSE-SDK-latest.zip
-  chgrp dsdp-tm-rse ../N.latest/RSE-SDK-latest.zip
+  #chmod g+w ../N.latest/RSE-SDK-latest.zip
+  #chgrp dsdp-tmadmin ../N.latest/RSE-SDK-latest.zip
   
   #Update the testUpdates sites
-  sg dsdp-tm-rse -c "echo \"Refreshing update site\" "
+  echo "Refreshing update site"
   cd $HOME/downloads-tm/testUpdates/bin
   ./mkTestUpdates.sh
-  sg dsdp-tm-rse -c "echo \"Refreshing signedUpdates site\" "
+  echo "Refreshing signedUpdates site"
   cd $HOME/downloads-tm/signedUpdates/bin
   ./mkTestUpdates.sh
 
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
index 23dfc108028..d3c5ae7fcc2 100755
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
@@ -12,8 +12,7 @@
 #Bootstrapping script to perform N-builds on build.eclipse.org
 
 #nothing we do should be hidden from the world
-##newgrp dsdp-tm-rse # newgrp doesnt work from shellscripts -- use sg instead
-umask 2
+umask 22
 
 #Use Java5 on build.eclipse.org
 #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
@@ -38,16 +37,16 @@ echo "Updating builder from CVS..."
 cd org.eclipse.rse.build
 stamp=`date +'%Y%m%d-%H%M'`
 log=$HOME/ws/log-N$stamp.txt
-sg dsdp-tm-rse -c "touch $log"
-sg dsdp-tm-rse -c "cvs -q update -RPd >> $log 2>&1"
+touch $log
+cvs -q update -RPd >> $log 2>&1
 daystamp=`date +'%Y%m%d-%H'`
 
 echo "Running the builder..."
-sg dsdp-tm-rse -c "./nightly.sh >> $log 2>&1"
+./nightly.sh >> $log 2>&1
 tail -50 $log
 
 #Fixup permissions and group id on download.eclpse.org (just to be safe)
-chmod -R g+w $HOME/ws/publish/N${daystamp}*
+#chmod -R g+w $HOME/ws/publish/N${daystamp}*
 
 #Copy latest SDK in order to give access to DOC server
 cd $HOME/ws/publish
diff --git a/releng/org.eclipse.rse.build/bin/doit_sbuild.sh b/releng/org.eclipse.rse.build/bin/doit_sbuild.sh
index 29d8fe12ebb..798d416bf9b 100755
--- a/releng/org.eclipse.rse.build/bin/doit_sbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_sbuild.sh
@@ -13,8 +13,7 @@
 #Will ask the user for label and build ID
 
 #nothing we do should be hidden from the world
-##newgrp dsdp-tm-rse # newgrp doesnt work from shellscripts -- use sg instead
-umask 2
+umask 22
 
 #Use Java5 on build.eclipse.org
 #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH
@@ -39,24 +38,24 @@ echo "Updating builder from CVS..."
 cd org.eclipse.rse.build
 stamp=`date +'%Y%m%d-%H%M'`
 log=$HOME/ws/log-$stamp.txt
-sg dsdp-tm-rse -c "touch $log"
-sg dsdp-tm-rse -c "cvs -q update -RPd"
+touch $log
+cvs -q update -RPd
 daystamp=`date +'%Y%m%d*%H'`
 echo "Enter tag to fetch from CVS (default is HEAD):"
 echo "Enter build type (P,N,I,S,R,M):"
 echo "Enter the build id (default is x$stamp):"
-sg dsdp-tm-rse -c "perl ./build.pl >> $log 2>&1"
+perl ./build.pl >> $log 2>&1
 #tail -50 $log
 
 #Fixup permissions and group id on download.eclpse.org (just to be safe)
-chmod -R g+w $HOME/ws/working/package/*${daystamp}*
+#chmod -R g+w $HOME/ws/working/package/*${daystamp}*
 
 #Publish
-echo "sg dsdp-tm-rse -c \"cp -R $HOME/ws/working/package/*${daystamp}* $HOME/ws/publish\""
-sg dsdp-tm-rse -c "cp -R $HOME/ws/working/package/*${daystamp}* $HOME/ws/publish"
-sg dsdp-tm-rse -c "rm -rf $HOME/ws/publish/*${daystamp}*/updates"
-echo "chmod -R g+w $HOME/ws/publish/*${daystamp}*"
-chmod -R g+w $HOME/ws/publish/*${daystamp}*
+echo "cp -R $HOME/ws/working/package/*${daystamp}* $HOME/ws/publish"
+cp -R $HOME/ws/working/package/*${daystamp}* $HOME/ws/publish
+rm -rf $HOME/ws/publish/*${daystamp}*/updates
+#echo "chmod -R g+w $HOME/ws/publish/*${daystamp}*"
+#chmod -R g+w $HOME/ws/publish/*${daystamp}*
 
 #Check the publishing
 cd $HOME/ws/publish
@@ -67,10 +66,10 @@ if [ -f package.count ]; then
   mv package.count package.count.orig
   
   #Update the testUpdates sites
-  sg dsdp-tm-rse -c "echo \"Refreshing update site\" "
+  echo "Refreshing update site"
   cd $HOME/downloads-tm/testUpdates/bin
   ./mkTestUpdates.sh
-  sg dsdp-tm-rse -c "echo \"Refreshing signedUpdates site\" "
+  echo "Refreshing signedUpdates site"
   cd $HOME/downloads-tm/signedUpdates/bin
   ./mkTestUpdates.sh
   cd "$curdir"