Minor fix in new_release_tasks
diff --git a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
index 4b4f39e..305e6c1 100644
--- a/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
+++ b/releng/org.eclipse.epsilon.releng/new_version_tasks.sh
@@ -3,7 +3,7 @@
Downloads=/home/data/httpd/download.eclipse.org/epsilon
Archives=/home/data/httpd/archive.eclipse.org/epsilon
UpdatesName=updates
-JavadocsName=javadocs
+JavadocsName=javadoc
InterimVersion=interim
InterimJavadocs=$InterimVersion-$JavadocsName
NewVersion=2.2
@@ -13,21 +13,20 @@
mkdir -p $Archives/$OldVersion &&
cp -r $Downloads/$UpdatesName/$OldVersion/* $Archives/$OldVersion &&
mv $Downloads/$OldVersion/* $Archives/$OldVersion &&
-rm -rf $Downloads/$OldVersion
-
+rm -rf $Downloads/$OldVersion &&
cd $Downloads &&
echo "Copying update site..." &&
mkdir -p $UpdatesName/$NewVersion &&
-cp -r $InterimVersion/* $UpdatesName/$NewVersion
+cp -r $InterimVersion/* $UpdatesName/$NewVersion &&
+rm -rf $UpdatesName/$NewVersion/$InterimVersion &&
if [ -e $UpdatesName/$NewVersion/epsilon-${InterimVersion}-site.zip ]; then
mv $UpdatesName/$NewVersion/epsilon-${InterimVersion}-site.zip $UpdatesName/$NewVersion/epsilon-${NewVersion}-site.zip
fi &&
echo "Copying $JavadocsName..." &&
mkdir -p $NewVersion/$JavadocsName &&
cp -r $InterimJavadocs/* $NewVersion/$JavadocsName &&
+rm -rf $NewVersion/$JavadocsName/$InterimJavadocs &&
echo "Adding $NewVersion to composite..." &&
-cd $UpdatesName &&
-rm -rf $NewVersion/interim &&
ant -f /shared/modeling/tools/promotion/manage-composite.xml add -Dchild.repository=$NewVersion
#cd /home/data/httpd/download.eclipse.org/epsilon/temp
