From a998f296ec1691a41651754f15baa2a6d15cf43c Mon Sep 17 00:00:00 2001
From: Flavio Serrapica <flavioserrapica@gmail.com>
Date: Thu, 14 Apr 2016 09:12:49 +0200
Subject: [PATCH] Update

Add arguments for skipping Java and Maven installation
---
 install/install_dmason.sh | 77 +++++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/install/install_dmason.sh b/install/install_dmason.sh
index 2bce9511..1787f6bf 100644
--- a/install/install_dmason.sh
+++ b/install/install_dmason.sh
@@ -1,40 +1,68 @@
 #!/bin/bash
 
+DMASON_INSTALL_FOLDER="dmason_install"
+SKIP_JAVA_INSTALL=false;
+SKIP_MAVEN_INSTALL=false;
+
 if [ $(id -u) -ne 0 ]; then
     echo "You have to run this script as root"
     exit -1
 fi
 
+while getopts "java:maven" opt ; do
+		
+	case $opt in
+		java) 
+			SKIP_JAVA_INSTALL=true;
+			;;
+		maven)
+			SKIP_MAVEN_INSTALL=true;
+			;;
+	esac
+done
+
 
 # create current directory
-mkdir dmason
-cd dmason
+mkdir $DMASON_INSTALL_FOLDER
+cd $DMASON_INSTALL_FOLDER
 
 #download java and set JAVA_HOME env
-wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u73-b02/jdk-8u73-linux-x64.tar.gz
-tar xzvf jdk-8u73-linux-x64.tar.gz
-mkdir -p "$HOME/java"
-cp -r jdk1.8.0_73 "$HOME/java" 
 JAVA_HOME="$HOME/java/jdk1.8.0_73"
-chown -R $SUDO_USER:$SUDO_USER "$HOME/java"
-echo "installing jdk in $JAVA_HOME"
+if [ ! $SKIP_JAVA_INSTALL ]; then
+	wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u73-b02/jdk-8u73-linux-x64.tar.gz
+	tar xzvf jdk-8u73-linux-x64.tar.gz
+	mkdir -p "$HOME/java"
+	cp -r jdk1.8.0_73 "$HOME/java" 
+
+	chown -R $SUDO_USER:$SUDO_USER "$HOME/java"
+	echo "installing jdk in $JAVA_HOME"
+
+fi
+
 export JAVA_HOME
 export PATH=$PATH:$JAVA_HOME
 
-update-alternatives --install "/usr/bin/java" "java" "$JAVA_HOME/bin/java" 1 
-update-alternatives --set "java" "JAVA_HOME/bin/java" 
-update-alternatives --install "/usr/bin/javac" "javac" "$JAVA_HOME/bin/javac" 1 
-update-alternatives --set "javac" "$JAVA_HOME/bin/javac"
-update-alternatives --install "/usr/bin/javaws" "javaws" "$JAVA_HOME/bin/javaws" 1 
-update-alternatives --set "javaws" "$JAVA_HOME/bin/javaws"
+if [ ! $SKIP_JAVA_INSTALL ]; then
+	update-alternatives --install "/usr/bin/java" "java" "$JAVA_HOME/bin/java" 1 
+	update-alternatives --set "java" "JAVA_HOME/bin/java" 
+	update-alternatives --install "/usr/bin/javac" "javac" "$JAVA_HOME/bin/javac" 1 
+	update-alternatives --set "javac" "$JAVA_HOME/bin/javac"
+	update-alternatives --install "/usr/bin/javaws" "javaws" "$JAVA_HOME/bin/javaws" 1 
+	update-alternatives --set "javaws" "$JAVA_HOME/bin/javaws"
+fi
+
+
 
 #download maven and set MAVEN_HOME env
-wget http://apache.panu.it/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz#
-tar xzvf apache-maven-3.3.9-bin.tar.gz
-mkdir -p "$HOME/maven"
-cp -r apache-maven-3.3.9 "$HOME/maven"
+if [ ! $SKIP_MAVEN_INSTALL ]; then
+	wget http://apache.panu.it/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz#
+	tar xzvf apache-maven-3.3.9-bin.tar.gz
+	mkdir -p "$HOME/maven"
+	cp -r apache-maven-3.3.9 "$HOME/maven"
+	chown -R $SUDO_USER:$SUDO_USER "$HOME/maven"
+fi
+
 MAVEN_HOME="$HOME/maven/apache-maven-3.3.9/"
-chown -R $SUDO_USER:$SUDO_USER "$HOME/maven"
 export PATH=$PATH:$MAVEN_HOME:$MAVEN_HOME/bin
 
 
@@ -42,12 +70,13 @@ export PATH=$PATH:$MAVEN_HOME:$MAVEN_HOME/bin
 #alpha version 
 #wget https://github.com/isislab-unisa/dmason/archive/master.zip
 #unzip master.zip
-wget https://github.com/isislab-unisa/dmason/archive/DMASON3.1-alpha.zip
-unzip DMASON3.1-alpha.zip
+wget https://github.com/isislab-unisa/dmason/archive/DMASON3.1-beta.zip
+unzip DMASON3.1-beta.zip
 
 
 # run maven install on dmason project 
-cd dmason-DMASON3.1-alpha
+#cd dmason-master
+cd dmason-DMASON3.1-beta
 mvn -Dmaven.test.skip=true clean package
 
 #create folder of executing environment
@@ -59,6 +88,6 @@ chown -R $SUDO_USER:$SUDO_USER "$HOME/dmason"
 
 #remove current directory CONTRolla
 cd ../..
-rm -r dmason
+rm -r $DMASON_INSTALL_FOLDER
 #display folder
-echo "DMASON was installed in $HOME/dmason"
+echo "DMASON has been installed in $HOME/dmason"