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 67316e5be9958b6bd95508d79d9a0a48d61d15e3..a786ba1c81b7cb317a96e596cede66f2311ad082 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 f74b3cb278d02b6e29510be38769d30273bccadf..8ab2f70e1417dc1472947282d0fb51efdf9709da 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)); }