diff --git a/installation/resource/installer/bin/upgrade.sh b/installation/resource/installer/bin/upgrade.sh index 0fe91fcdacbbc1f1c700dad055f261de713270e1..11a1aeadac99a6682507d9ea6a0fde9bca5bb3b3 100755 --- a/installation/resource/installer/bin/upgrade.sh +++ b/installation/resource/installer/bin/upgrade.sh @@ -12,6 +12,8 @@ OPENBIS_INSTALL_DIR=$BASE/.. TARBALL=$1 INSTALLER_DIR=${TARBALL%.tar.gz} +mkdir -p $OPENBIS_INSTALL_DIR/backup + pushd $ROOT_DIR > /dev/null echo "Extracting installation tarball $TARBALL.." @@ -25,14 +27,17 @@ sed -i '' "$sed_params" $INSTALLER_DIR/console.properties # run the installation $INSTALLER_DIR/run-console.sh - rm -rf $INSTALLER_DIR -echo "Moving $TARBALL to $OPENBIS_INSTALL_DIR/backup ..." -mkdir -p $OPENBIS_INSTALL_DIR/backup -mv $TARBALL $OPENBIS_INSTALL_DIR/backup +BACKUP_DIR_NAME=`ls -rt $OPENBIS_INSTALL_DIR/backup | tail -1` +BACKUP_DIR=$OPENBIS_INSTALL_DIR/backup/$BACKUP_DIR_NAME + +echo "Moving $TARBALL to $BACKUP_DIR..." +mv $TARBALL $BACKUP_DIR + } + BASE=`dirname "$0"` if [ ${BASE#/} == ${BASE} ]; then BASE="`pwd`/${BASE}" diff --git a/openbis/dist/admin/upgrade.sh b/openbis/dist/admin/upgrade.sh index e654693d19af8e4cc0eb3cfe8717e5e303e6d6c7..0477fe31276c4173462105615f72b28fef7a39f5 100755 --- a/openbis/dist/admin/upgrade.sh +++ b/openbis/dist/admin/upgrade.sh @@ -49,6 +49,8 @@ OPENBIS_INSTALL_DIR=$BASE/.. TARBALL=$1 INSTALLER_DIR=${TARBALL%.tar.gz} +mkdir -p $OPENBIS_INSTALL_DIR/backup + pushd $ROOT_DIR > /dev/null echo "Extracting installation tarball $TARBALL.." @@ -62,14 +64,17 @@ sed -i '' "$sed_params" $INSTALLER_DIR/console.properties # run the installation $INSTALLER_DIR/run-console.sh - rm -rf $INSTALLER_DIR -echo "Moving $TARBALL to $OPENBIS_INSTALL_DIR/backup ..." -mkdir -p $OPENBIS_INSTALL_DIR/backup -mv $TARBALL $OPENBIS_INSTALL_DIR/backup +BACKUP_DIR_NAME=`ls -rt $OPENBIS_INSTALL_DIR/backup | tail -1` +BACKUP_DIR=$OPENBIS_INSTALL_DIR/backup/$BACKUP_DIR_NAME + +echo "Moving $TARBALL to $BACKUP_DIR..." +mv $TARBALL $BACKUP_DIR + } + BASE=`dirname "$0"` if [ ${BASE#/} == ${BASE} ]; then BASE="`pwd`/${BASE}" diff --git a/screening/dist/admin/upgrade.sh b/screening/dist/admin/upgrade.sh index ebd5520a8eeda58d71e737c0efd5db158ff7de07..14c2f6de13520d32124d86b8b3a4cc6929cb5d44 100755 --- a/screening/dist/admin/upgrade.sh +++ b/screening/dist/admin/upgrade.sh @@ -51,6 +51,8 @@ OPENBIS_INSTALL_DIR=$BASE/.. TARBALL=$1 INSTALLER_DIR=${TARBALL%.tar.gz} +mkdir -p $OPENBIS_INSTALL_DIR/backup + pushd $ROOT_DIR > /dev/null echo "Extracting installation tarball $TARBALL.." @@ -64,14 +66,17 @@ sed -i '' "$sed_params" $INSTALLER_DIR/console.properties # run the installation $INSTALLER_DIR/run-console.sh - rm -rf $INSTALLER_DIR -echo "Moving $TARBALL to $OPENBIS_INSTALL_DIR/backup ..." -mkdir -p $OPENBIS_INSTALL_DIR/backup -mv $TARBALL $OPENBIS_INSTALL_DIR/backup +BACKUP_DIR_NAME=`ls -rt $OPENBIS_INSTALL_DIR/backup | tail -1` +BACKUP_DIR=$OPENBIS_INSTALL_DIR/backup/$BACKUP_DIR_NAME + +echo "Moving $TARBALL to $BACKUP_DIR..." +mv $TARBALL $BACKUP_DIR + } + BASE=`dirname "$0"` if [ ${BASE#/} == ${BASE} ]; then BASE="`pwd`/${BASE}"