From: Roland Häder <roland@mxchange.org>
Date: Thu, 6 Feb 2020 12:19:20 +0000 (+0100)
Subject: Fixes:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef24224c8a90067554cb3e0dfff307a8f02aa4d7;p=payara-vagrant.git

Fixes:
- put all strings in double quotes
- all variables are ${FOO} for being more shell-standard
- OpenJDK 8 is really okay here, 7 is by far to old
- Midnight Commander is a very powerful program, including an editor

Signed-off-by: Roland Häder <haeder@ambroox.de>
---

diff --git a/payara_service-4.1.1.154 b/payara_service-4.1.1.154
deleted file mode 100644
index b1095c5..0000000
--- a/payara_service-4.1.1.154
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Basic Payara service
-# 
-
-PAYARA_HOME=/opt/payara/payara-4.1.1.154/payara41
-export PAYARA_HOME
-
-
-
-start() {
-	echo -n "Starting Payara: "
-	$PAYARA_HOME/bin/asadmin start-domain $1
-}
-
-stop() {
-	echo -n "Stopping Payara: "
-	$PAYARA_HOME/bin/asadmin stop-domain $1
-}
-
-
-case "$1" in
-start)
-    start ${2:-payaradomain}
-    ;;
-stop)
-    stop ${2:-payaradomain}
-    ;;
-restart)
-    $PAYARA_HOME/bin/asadmin restart-domain >/dev/null
-    ;;
-\*)
-    echo "usage: $0 (start|stop|restart|help)"
-esac
diff --git a/payara_service-4.1.2.181 b/payara_service-4.1.2.181
old mode 100644
new mode 100755
diff --git a/provision.sh b/provision.sh
old mode 100644
new mode 100755
index 6052d4d..bf6008f
--- a/provision.sh
+++ b/provision.sh
@@ -14,26 +14,25 @@ PAYARA_VERSION="4.1.2.181"
 # Payara directory
 PAYARA_HOME="/opt/payara/payara-${PAYARA_VERSION}"
 
-
 # Payara Edition URLs
 case "${PAYARA_VERSION}" in 
 	4.1.2.181)
 		# The below links are to 4.1.2.181
-		FULL=https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/4.1.2.181/payara-4.1.2.181.zip
-		WEB=https://search.maven.org/remotecontent?filepath=fish/payara/blue/distributions/payara-web/4.1.2.181/payara-web-4.1.2.181.zip
-		MINIMAL=
-		MICRO=
-		EMBEDDED_FULL=
-		EMBEDDED_WEB=
-		MULTI_LANGUAGE_FULL=https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara-ml/4.1.2.181/payara-ml-4.1.2.181.zip
-		MULTI_LANGUAGE_WEB=https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara-web-ml/4.1.2.181/payara-web-ml-4.1.2.181.zip
+		FULL="https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/4.1.2.181/payara-4.1.2.181.zip"
+		WEB="https://search.maven.org/remotecontent?filepath=fish/payara/blue/distributions/payara-web/4.1.2.181/payara-web-4.1.2.181.zip"
+		MINIMAL=""
+		MICRO=""
+		EMBEDDED_FULL=""
+		EMBEDDED_WEB=""
+		MULTI_LANGUAGE_FULL="https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara-ml/4.1.2.181/payara-ml-4.1.2.181.zip"
+		MULTI_LANGUAGE_WEB="https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara-web-ml/4.1.2.181/payara-web-ml-4.1.2.181.zip"
 	;;
 	\*)
-	echo "unknown version number"
+		echo "unknown version number"
 esac
 
 # Payara edition (Full, Web, Micro, etc., from above list)
-PAYARA_ED=${FULL}
+PAYARA_ED="${FULL}"
 
 #
 #
@@ -110,7 +109,7 @@ installService() {
 	echo "Adding payara system startup..."
 	update-rc.d payara defaults > /dev/null 
 	
-	echo "starting Payara..."
+	echo "Starting Payara..."
 	
 	# Explicitly start payaradomain by default
 	case "${PAYARA_VERSION}" in
@@ -139,3 +138,4 @@ if [ ${PAYARA_ED} = ${WEB}                 ] ||
    [ ${PAYARA_ED} = ${MULTI_LANGUAGE_WEB}  ]; then
 	installService
 fi
+