From fd663e4a67a6ccd86cb759d86866f4ef29f9edb0 Mon Sep 17 00:00:00 2001 From: juanf <juanf> Date: Wed, 4 Oct 2017 11:52:24 +0000 Subject: [PATCH] SSDM-5688 : Bugfix on smarter script SVN: 38788 --- installation/resource/installer/bin/upgrade-eln-v3.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installation/resource/installer/bin/upgrade-eln-v3.sh b/installation/resource/installer/bin/upgrade-eln-v3.sh index 749e2ab3f52..ae76abc8274 100644 --- a/installation/resource/installer/bin/upgrade-eln-v3.sh +++ b/installation/resource/installer/bin/upgrade-eln-v3.sh @@ -18,7 +18,7 @@ #-- Restore etc folder from backup (skip if backup don't exist) echo "1 - Starting ELN-LIMS Upgrade" - +# set -x # Define a timestamp function timestamp() { date +"%y%m%d-%H%M" @@ -68,11 +68,11 @@ if [ -d $ELN_INSTALLATION ]; then tar xfz $ELN_TARBALL -C $CORE_PLUGINS #if is minimum master data, remove the extra types script - if [ IS_MINIMUM_MASTER_DATA ]; then + if [ -f $ELN_INSTALLATION_MINIMUM_MD_SCRIPT ]; then + echo "7 - Not modifying master data scripts since a standard master data installation was found" + else echo "7 - Replacing master data script since minimum master data installation was found" mv $ELN_INSTALLATION_MINIMUM_MD_SCRIPT $ELN_INSTALLATION_STANDARD_MD_SCRIPT - else - echo "7 - Not modifying master data scripts since a standard master data installation was found" fi #Restore config folder contents if they where backup -- GitLab