Adapt dist script to new folder structure
git-svn-id: https://svn.apache.org/repos/asf/directory/studio/trunk@1751548 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dist/dist.sh b/dist/dist.sh
index a96dee8..208821c 100755
--- a/dist/dist.sh
+++ b/dist/dist.sh
@@ -35,25 +35,10 @@
fi
echo
-echo "### Creating dist folders"
+echo "### Creating dist folder"
DIST_DIR=${TARGET_DIR}/${VERSION}
-UPDATE_SITE_DIR=${TARGET_DIR}/update/${VERSION}
mkdir -p ${DIST_DIR}
-mkdir -p ${UPDATE_SITE_DIR}
-echo
-echo "### Copying update sites"
-cp -a ../p2repositories/dependencies/target/repository ${UPDATE_SITE_DIR}/dependencies
-cp -a ../p2repositories/eclipse/target/repository ${UPDATE_SITE_DIR}/eclipse
-
-echo
-echo "### Signing update sites"
-cd ${UPDATE_SITE_DIR}/dependencies
-sh ${WORK_DIR}/sign.sh
-zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository-dependencies.zip *
-cd ${UPDATE_SITE_DIR}/eclipse
-sh ${WORK_DIR}/sign.sh
-zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository.zip *
echo
echo "### Copying dist files"
@@ -88,5 +73,23 @@
sh ${WORK_DIR}/sign.sh
echo
+echo "### Copying update sites"
+UPDATE_SITE_DIR=${TARGET_DIR}/${VERSION}/update
+mkdir -p ${UPDATE_SITE_DIR}
+cd ${WORK_DIR}
+cp -a ../p2repositories/dependencies/target/repository ${UPDATE_SITE_DIR}/dependencies
+cp -a ../p2repositories/eclipse/target/repository ${UPDATE_SITE_DIR}/eclipse
+
+echo
+echo "### Signing update sites"
+cd ${UPDATE_SITE_DIR}/dependencies
+sh ${WORK_DIR}/sign.sh
+zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository-dependencies.zip *
+cd ${UPDATE_SITE_DIR}/eclipse
+sh ${WORK_DIR}/sign.sh
+zip -r ${DIST_DIR}/ApacheDirectoryStudio-${VERSION}-p2repository.zip *
+
+
+echo
echo "### Success"
