From 921e3eecbf88c0ecb63dffa3eedfeb43bdb5bb19 Mon Sep 17 00:00:00 2001 From: juanf <juanf> Date: Tue, 6 Dec 2016 15:52:08 +0000 Subject: [PATCH] SSDM-4444 : Removing ELN plugin specific code from backup/restore during upgrades, no longer necessary. SVN: 37446 --- .../resource/installer/bin/backup-installation.sh | 7 ------- .../resource/installer/bin/restore-config-from-backup.sh | 9 +-------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/installation/resource/installer/bin/backup-installation.sh b/installation/resource/installer/bin/backup-installation.sh index f65699e1fe0..047c004be80 100755 --- a/installation/resource/installer/bin/backup-installation.sh +++ b/installation/resource/installer/bin/backup-installation.sh @@ -56,11 +56,4 @@ if [ -d $BACKUP_DIR/datastore_server/data/sessionWorkspace ]; then rm -r $BACKUP_DIR/datastore_server/data/sessionWorkspace fi -if [ -d $ROOT_DIR/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc ]; then - echo "mkdir -p $BACKUP_DIR/eln-lims/1/as/webapps/eln-lims/html" - mkdir -p $BACKUP_DIR/eln-lims/1/as/webapps/eln-lims/html - echo "$ROOT_DIR/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc $BACKUP_DIR/eln-lims/1/as/webapps/eln-lims/html" - mv $ROOT_DIR/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc $BACKUP_DIR/eln-lims/1/as/webapps/eln-lims/html -fi - echo "DONE" diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh index 860f04392df..1218756c271 100755 --- a/installation/resource/installer/bin/restore-config-from-backup.sh +++ b/installation/resource/installer/bin/restore-config-from-backup.sh @@ -57,11 +57,4 @@ cp $CONF/dss-log.xml $ROOT/datastore_server/etc/log.xml cp $CONF/datastore_server.conf $ROOT/datastore_server/etc/ # not always present copyIfExists $CONF/.keystore $ROOT/datastore_server/etc/openBIS.keystore -copyIfExists $CONF/ext-lib $ROOT/datastore_server - -# -- ELN-LIMS -if [ -d $ROOT/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc ]; then - if [ -d $CONF/../eln-lims/1/as/webapps/eln-lims/html/etc ]; then - cp $CONF/../eln-lims/1/as/webapps/eln-lims/html/etc/* $ROOT/core-plugins/eln-lims/1/as/webapps/eln-lims/html/etc/ - fi -fi \ No newline at end of file +copyIfExists $CONF/ext-lib $ROOT/datastore_server \ No newline at end of file -- GitLab