SSDM-4020 : Refactoring to make detect/update types more bulletproof, need to...

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

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

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));
 
     }