Merge remote-tracking branch 'origin/align-start-script'

Author: sol

monit_restart.sh

@@ -25,6 +25,7 @@ HOME="/home/sol"
 
 # it is important to set the proper locale
 . $HOME/.locale
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
 JAVA_OPTS=$(echo "$JAVA_OPTS" |sed 's#,#\ #g')
 
 cd $HOME/git/$REPO
@@ -33,7 +34,7 @@ case $ACTION in
 		if [ -f target/universal/stage/RUNNING_PID ]; then
 			kill $(cat target/universal/stage/RUNNING_PID)
 		fi
-		JAVA_OPTS="$JAVA_OPTS -XX:+ExitOnOutOfMemoryError" $HOME/activator-dist-1.3.5/activator "start $PORT"
+		JAVA_OPTS="$JAVA_OPTS -XX:+ExitOnOutOfMemoryError" sbt --java-home $JAVA_HOME "start $PORT"
 		;;
 	stop)
 		if [ -f target/universal/stage/RUNNING_PID ]; then