From 442344b89d587a25e7c0921f43f13b47b89f7752 Mon Sep 17 00:00:00 2001 From: Stuart Berg Date: Thu, 4 Jun 2020 22:34:59 -0400 Subject: [PATCH] scripts/make-release-distribution: Ship both versions of the dvid console, leave the old version active by default --- scripts/make-release-distribution.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/make-release-distribution.sh b/scripts/make-release-distribution.sh index 5d15086b..56674b5a 100755 --- a/scripts/make-release-distribution.sh +++ b/scripts/make-release-distribution.sh @@ -20,13 +20,21 @@ DVID_DISTRO_ENV=$(conda info --base)/envs/dvid-distro # Cleanup from the previous distro env, if it exists. if [ -d ${DVID_DISTRO_ENV} ]; then - + conda remove -y -n dvid-distro --all fi -# Create the new distro environment and install dvid to it +# Create the new distro environment and install dvid to it conda create -y -n dvid-distro dvid +# Install both versions of the dvid-web-console (old and new) +conda install -y -n dvid-distro dvid-web-console=3 +cp -R ${DVID_DISTRO_ENV}/http/dvid-web-console ${DVID_DISTRO_ENV}/http/dvid-web-console-3 + +# ...leave the old one active by default. +conda install -y -n dvid-distro dvid-web-console=2.1.6 +cp -R ${DVID_DISTRO_ENV}/http/dvid-web-console ${DVID_DISTRO_ENV}/http/dvid-web-console-2 + cp ${THIS_SCRIPT_DIR}/distro-files/* ${DVID_DISTRO_ENV} # Make a bash array to capture the version of the dvid conda package @@ -43,7 +51,7 @@ rm -f ${TARBALL_NAME} mv dvid-distro ${DIST_NAME} -echo "Creating ${TARBALL_NAME} ..." +echo "Creating ${TARBALL_NAME} ..." tar -cjf ${TARBALL_NAME} ${DIST_NAME}