From 0e33b61b4542cec6fd71f9b57a0c509059a9f756 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 3 Oct 2011 10:24:56 +0000 Subject: [PATCH] [releng] make signed and add TM-repo.zip automagically --- .../org.eclipse.rse.build/bin/doit_irsbuild.sh | 10 ++++++---- .../org.eclipse.rse.build/bin/make_signed.sh | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh index ebfc495c18c..63160095851 100755 --- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh +++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh @@ -179,11 +179,13 @@ if [ -f package.count -a "$FILES" != "" ]; then cd $HOME/ws2/publish cd $DIRS cp $HOME/downloads-tm/signedUpdates/TM-repo-${realstamp}.zip . - count=`cat package.count` - count=`expr $count + 1` - rm package.count - echo $count > package.count echo "Successfully created TM-repo-${realstamp}.zip" + if [ -f package.count ]; then + count=`cat package.count` + count=`expr $count + 1` + rm package.count + echo $count > package.count + fi echo "Making signed..." UPDATE_SITE=$HOME/downloads-tm/signedUpdates diff --git a/releng/org.eclipse.rse.build/bin/make_signed.sh b/releng/org.eclipse.rse.build/bin/make_signed.sh index ed0545447cc..d4333283136 100755 --- a/releng/org.eclipse.rse.build/bin/make_signed.sh +++ b/releng/org.eclipse.rse.build/bin/make_signed.sh @@ -219,11 +219,13 @@ echo "ls ${OUTPUT}" ls ${OUTPUT} echo "" cd "${DROPDIR}" -if [ ! -d ${DROPDIR}.unsigned ]; then - DROPBASE=`basename "${DROPDIR}"` - mkdir ../${DROPBASE}.unsigned - tar cf - . | (cd ../${DROPBASE}.unsigned ; tar xf -) - chmod -R g+w ../${DROPBASE}.unsigned -fi -echo "cp -f ${OUTPUT}/* ." -echo "rm -rf ${tmpdir}" +#if [ ! -d ${DROPDIR}.unsigned ]; then +# DROPBASE=`basename "${DROPDIR}"` +# mkdir ../${DROPBASE}.unsigned +# tar cf - . | (cd ../${DROPBASE}.unsigned ; tar xf -) +# chmod -R g+w ../${DROPBASE}.unsigned +#fi +#echo "cp -f ${OUTPUT}/* ." +#echo "rm -rf ${tmpdir}" +cp -f ${OUTPUT}/* . +rm -rf ${tmpdir}