Fixed #10 and #12: added install of (openjdk) java, and updated ML8 a…

…nd MLCP install
grtjn · Dec 22, 2014 · ce73b29 · ce73b29
1 parent 3559cbf
commit ce73b29
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/opt/vagrant/install-ml-CentOS.sh b/opt/vagrant/install-ml-CentOS.sh
@@ -28,7 +28,7 @@ elif [ "$1" -eq "6" ]; then
     rpm -i /space/software/MarkLogic-6.0-5.3.x86_64.rpm
 elif [ "$1" -eq "8" ]; then
     echo "Installing ML 8..."
-    rpm -i /space/software/MarkLogic-8.0-20141113.x86_64.rpm
+    rpm -i /space/software/MarkLogic-8.0-20141124.x86_64.rpm
 else
     echo "Installing ML 7..."
     rpm -i /space/software/MarkLogic-7.0-4.1.x86_64.rpm

diff --git a/opt/vagrant/install-mlcp.sh b/opt/vagrant/install-mlcp.sh
@@ -2,13 +2,22 @@
 echo "running $0 $@"
 
 yum -y install zip unzip
+yum -y install java
 
-if [ ! -d /opt/mlcp-Hadoop2-1.2-3 ]; then
-    cd /opt && unzip /space/software/mlcp-Hadoop2-1.2-3-bin.zip
-    if [ -h /usr/local/mlcp ]; then
-        unlink /usr/local/mlcp
-    fi
-fi
-if [ ! -h /usr/local/mlcp ]; then
-    cd /usr/local && ln -s /opt/mlcp-Hadoop2-1.2-3 mlcp
+if [ "$1" -eq "8" ]; then
+    echo "Installing MLCP 1.3..."
+	if [ ! -d /opt/mlcp-Hadoop2-1.3 ]; then
+	    cd /opt && unzip /space/software/mlcp-Hadoop2-1.3-bin-20141124.zip
+	fi
+	if [ ! -h /usr/local/mlcp ]; then
+	    cd /usr/local && ln -s /opt/mlcp-Hadoop2-1.3 mlcp
+	fi
+else
+    echo "Installing MLCP 1.2-3..."
+	if [ ! -d /opt/mlcp-Hadoop2-1.2-3 ]; then
+	    cd /opt && unzip /space/software/mlcp-Hadoop2-1.2-3-bin.zip
+	fi
+	if [ ! -h /usr/local/mlcp ]; then
+	    cd /usr/local && ln -s /opt/mlcp-Hadoop2-1.2-3 mlcp
+	fi
 fi