From 43081b77e2b960ad474fce45d60d3b9835b69eca Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Mon, 29 Aug 2016 14:33:54 +0000
Subject: [PATCH] SSDM-4020 : Refactoring to make detect/update types more
bulletproof, need to rename file to allow jython to use it with import
command
SVN: 37003
---
.../resource/installer/bin/disable-eln-master-data-script.sh | 2 +-
.../openbis/installer/izpack/GlobalInstallationContext.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/installation/resource/installer/bin/disable-eln-master-data-script.sh b/installation/resource/installer/bin/disable-eln-master-data-script.sh
index 67316e5be99..a786ba1c81b 100644
--- a/installation/resource/installer/bin/disable-eln-master-data-script.sh
+++ b/installation/resource/installer/bin/disable-eln-master-data-script.sh
@@ -6,6 +6,6 @@ fi
if [ "$ELN_MASTER_DATA" == "false" ]; then
echo "Disabling ELN master data script";
- mv $BASE/../servers/core-plugins/eln-lims/1/as/initialize-master-data-minimum.py $BASE/../servers/core-plugins/eln-lims/1/as/initialize-master-data.py;
+ mv $BASE/../servers/core-plugins/eln-lims/1/as/initializemasterdataminimum.py $BASE/../servers/core-plugins/eln-lims/1/as/initialize-master-data.py;
fi
touch $BASE/../servers/core-plugins/eln-lims/1/as/.eln-master-data-installed
\ No newline at end of file
diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java
index f74b3cb278d..8ab2f70e141 100644
--- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java
+++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java
@@ -121,10 +121,10 @@ public class GlobalInstallationContext
isElnMasterDataNotInstalled = (isFirstTimeInstallation == true) ||
((new File(installDir, "servers/core-plugins/eln-lims/1/as/initialize-master-data.py").exists() == false) &&
- (new File(installDir, "servers/core-plugins/eln-lims/1/as/initialize-master-data-minimum.py").exists() == false))
+ (new File(installDir, "servers/core-plugins/eln-lims/1/as/initializemasterdataminimum.py").exists() == false))
||
((new File(installDir, "servers/core-plugins/eln-lims/1/as/.eln-master-data-installed").exists() == false) &&
- (new File(installDir, "servers/core-plugins/eln-lims/1/as/initialize-master-data-minimum.py").exists() == true));
+ (new File(installDir, "servers/core-plugins/eln-lims/1/as/initializemasterdataminimum.py").exists() == true));
}
--
GitLab