From f7b1dc077a2fe6e7aadc0276b01c13b84cdc95d1 Mon Sep 17 00:00:00 2001
From: prabushi <prabushisamarakoon@gmail.com>
Date: Mon, 25 May 2020 16:09:57 +0530
Subject: [PATCH] Read MI release candidate directory from the script

WSO2 MI release candidate has different versions for the zip file and for its inner directory. Therefore, we allow defining these versions in the pom and reading them as arguments from the installer script.
---
 pom.xml                                               |  3 ++-
 .../org.wso2.developerstudio.rcp.product/pom.xml      |  2 +-
 .../scripts/installer-script-oxygen.sh                | 11 ++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 155c7211c..4a7b7de90 100755
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,8 @@
         <version.sortpom.plugin>2.3.0</version.sortpom.plugin>
         <webeditor.version>4.0.0-SNAPSHOT</webeditor.version>
         <wso2.tomcat.version>7.0.59.wso2v3</wso2.tomcat.version>
-        <mi.product.version>1.1.0-beta3</mi.product.version>
+        <mi.product.version>1.1.0-rc1</mi.product.version>
+        <mi.product.directory>1.1.0</mi.product.directory>
         <apache.maven.version>3.6.3</apache.maven.version>
         <apim.ctl.version>3.1.1</apim.ctl.version>
     </properties>
diff --git a/rcp-product/org.wso2.developerstudio.rcp.product/pom.xml b/rcp-product/org.wso2.developerstudio.rcp.product/pom.xml
index b724fc4a1..0a3af1bb4 100644
--- a/rcp-product/org.wso2.developerstudio.rcp.product/pom.xml
+++ b/rcp-product/org.wso2.developerstudio.rcp.product/pom.xml
@@ -244,7 +244,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <commandlineArgs>${mi.product.version} ${apache.maven.version} ${apim.ctl.version}</commandlineArgs>
+                            <commandlineArgs>${mi.product.version} ${apache.maven.version} ${apim.ctl.version} ${mi.product.directory}</commandlineArgs>
                             <executable>${project.basedir}/scripts/installer-script-oxygen.sh</executable>
                         </configuration>
                     </execution>
diff --git a/rcp-product/org.wso2.developerstudio.rcp.product/scripts/installer-script-oxygen.sh b/rcp-product/org.wso2.developerstudio.rcp.product/scripts/installer-script-oxygen.sh
index e7544b90a..7b3a59284 100755
--- a/rcp-product/org.wso2.developerstudio.rcp.product/scripts/installer-script-oxygen.sh
+++ b/rcp-product/org.wso2.developerstudio.rcp.product/scripts/installer-script-oxygen.sh
@@ -3,6 +3,7 @@ BASE_DIR=$(pwd)
 PRODUCT_VERSION=$1
 APACHE_MAVEN_VERSION=$2
 APIM_CTL_VERSION=$3
+PRODUCT_DIRECTORY=$4
 
 echo BASE_DIR $BASE_DIR and PRODUCT_VERSION $PRODUCT_VERSION
 
@@ -71,11 +72,11 @@ unzip $PRODUCT_PATH_ROOT/wso2mi-${PRODUCT_VERSION}.zip -d $PRODUCT_PATH_WIN_86/r
 unzip $PRODUCT_PATH_ROOT/wso2mi-${PRODUCT_VERSION}.zip -d $PRODUCT_PATH_WIN_64/runtime
 
 # Rename as "microesb" (this is the static name used in EI Tooling code)
-mv $PRODUCT_PATH_LINUX_86/runtime/wso2mi-$PRODUCT_VERSION $PRODUCT_PATH_LINUX_86/runtime/microesb
-mv $PRODUCT_PATH_LINUX_64/runtime/wso2mi-$PRODUCT_VERSION $PRODUCT_PATH_LINUX_64/runtime/microesb
-mv $PRODUCT_PATH_MACOS/DeveloperStudio.app/Contents/Eclipse/runtime/wso2mi-$PRODUCT_VERSION $PRODUCT_PATH_MACOS/DeveloperStudio.app/Contents/Eclipse/runtime/microesb
-mv $PRODUCT_PATH_WIN_86/runtime/wso2mi-$PRODUCT_VERSION $PRODUCT_PATH_WIN_86/runtime/microesb
-mv $PRODUCT_PATH_WIN_64/runtime/wso2mi-$PRODUCT_VERSION $PRODUCT_PATH_WIN_64/runtime/microesb
+mv $PRODUCT_PATH_LINUX_86/runtime/wso2mi-$PRODUCT_DIRECTORY $PRODUCT_PATH_LINUX_86/runtime/microesb
+mv $PRODUCT_PATH_LINUX_64/runtime/wso2mi-$PRODUCT_DIRECTORY $PRODUCT_PATH_LINUX_64/runtime/microesb
+mv $PRODUCT_PATH_MACOS/DeveloperStudio.app/Contents/Eclipse/runtime/wso2mi-$PRODUCT_DIRECTORY $PRODUCT_PATH_MACOS/DeveloperStudio.app/Contents/Eclipse/runtime/microesb
+mv $PRODUCT_PATH_WIN_86/runtime/wso2mi-$PRODUCT_DIRECTORY $PRODUCT_PATH_WIN_86/runtime/microesb
+mv $PRODUCT_PATH_WIN_64/runtime/wso2mi-$PRODUCT_DIRECTORY $PRODUCT_PATH_WIN_64/runtime/microesb
 
 # Unzip apche maven to relevant packages
 unzip $PRODUCT_PATH_ROOT/apache-maven-${APACHE_MAVEN_VERSION}-bin.zip -d $PRODUCT_PATH_LINUX_86/