X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=dist.sh;h=020632245ccde3fbe87beb4d42f945c31d16e8b3;hb=182cc8172d68912c706171d1dd399f885674de63;hp=5ea9f343efdd50bc5239730932bbae1d5cafbdf8;hpb=dcb3f1861ead93598bb7e1a030d30410b2f8b71f;p=jprojects-scripts.git

diff --git a/dist.sh b/dist.sh
index 5ea9f34..0206322 100755
--- a/dist.sh
+++ b/dist.sh
@@ -6,6 +6,9 @@ NAME="${PWD##*/}"
 # Generated JAR file
 DIST="dist/${NAME}.jar"
 
+# Configuration file
+DIST_CONFIG_FILE="${HOME}/.jprojects-dist.sh"
+
 # WildFly module base path
 WILDFLY_MODULE_BASE_PATH="${HOME}/wildfly_domain/modules/org/mxchange"
 
@@ -16,17 +19,28 @@ WILDFLY_MODULE_PATH="${WILDFLY_MODULE_BASE_PATH}/${NAME}/main"
 WILDFLY_MODULE_XML_FILE="wildfly/module.xml"
 
 # Glassfish base path (domain)
-GLASSFISH_BASE_PATH="${HOME}/gf_domain/domain/lib"
-
-# Remote Glassfish path
-GLASSFISH_SSH_PATH="/var/payara/domains/domain1/lib"
-
-# Remote SSH server (password-less access)
-GLASSFISH_SSH_SERVER="www.mxchange.org"
+GLASSFISH_BASE_PATH="${HOME}/gf_domain/lib"
 
 # Windows personal domain
 PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib"
 
+# Is the configuration file there?
+if [ ! -f "${DIST_CONFIG_FILE}" ]
+then
+	echo "$0: Configuration file '${DIST_CONFIG_FILE}' not found"
+	echo
+	echo "Following variables are needed for SSH upload:"
+	echo "- GLASSFISH_SSH_PATH"
+	echo "- GLASSFISH_SSH_USER"
+	echo "- GLASSFISH_SSH_SERVER"
+	echo
+	echo "And create a password-less SSH key."
+	sleep 3
+else
+	# Load it
+	source "${DIST_CONFIG_FILE}"
+fi
+
 # Generate list
 LIST=$(find ../*/lib/${NAME}.jar)
 LIST="${LIST} ${WILDFLY_MODULE_PATH}"
@@ -66,13 +80,17 @@ do
 	else
 		echo "$0: Project '${project}' not found."
 	fi
-
 done
 
-if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
+if [ -n "${GLASSFISH_SSH_USER}" -a -n "${GLASSFISH_SSH_SERVER}" -a -n "${GLASSFISH_SSH_PATH}" ]
 then
-	echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
-	scp "${DIST}" "${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}"
+	if [ "$1" != "r" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]
+	then
+		echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
+		scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" || exit 255
+	fi
+else
+	echo "$0: SSH upload disabled."
 fi
 
 # Copy module.xml ...