X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=dist.sh;h=fdd1e5d2f933f1c8742dcd4d8d771b38730ab9ab;hb=38cac8f41a57dbb03d88ea36aeb64521e065bcf0;hp=5097f6f56c613de3a1c900fc5d4d881c8854f02f;hpb=7923d9a2889a000861ae062f4a01fab7f2b5029d;p=juser-login-core.git

diff --git a/dist.sh b/dist.sh
index 5097f6f..fdd1e5d 100755
--- a/dist.sh
+++ b/dist.sh
@@ -29,47 +29,37 @@ if [ ! -f "${DIST_CONFIG_FILE}" ]
 then
 	echo "$0: Configuration file '${DIST_CONFIG_FILE}' not found"
 	echo
-	echo "Following variables are needed:"
+	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."
-	exit 1
-fi
-
-# Load it
-source "${DIST_CONFIG_FILE}"
-
-# All set?
-if [ -z "${GLASSFISH_SSH_PATH}" ]
-then
-	echo "$0: Variable GLASSFISH_SSH_PATH not set."
-	exit 1
-elif [ -z "${GLASSFISH_SSH_USER}" ]
-then
-	echo "$0: Variable GLASSFISH_SSH_USER not set."
-	exit 1
-elif [ -z "${GLASSFISH_SSH_SERVER}" ]
-then
-	echo "$0: Variable GLASSFISH_SSH_SERVER not set."
-	exit 1
+	sleep 3
+else
+	# Load it
+	source "${DIST_CONFIG_FILE}"
 fi
 
 # Generate list
 LIST=$(find ../*/lib/${NAME}.jar)
 LIST="${LIST} ${WILDFLY_MODULE_PATH}"
 
-if [ -d "${GLASSFISH_BASE_PATH}" ]
+if [ "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]
 then
-	echo "$0: Glassfish personal domain found, adding to LIST ..."
-	LIST="${LIST} ${GLASSFISH_BASE_PATH}"
-fi
+	if [ -d "${GLASSFISH_BASE_PATH}" ]
+	then
+		echo "$0: Glassfish personal domain found, adding to LIST ..."
+		LIST="${LIST} ${GLASSFISH_BASE_PATH}"
+	fi
 
-if [ -d "${PERSONAL_DOMAIN_PATH}" ]
-then
-	echo "$0: Personal domain found, adding to LIST ..."
-	LIST="${LIST} ${PERSONAL_DOMAIN_PATH}"
+	if [ -d "${PERSONAL_DOMAIN_PATH}" ]
+	then
+		echo "$0: Personal domain found, adding to LIST ..."
+		LIST="${LIST} ${PERSONAL_DOMAIN_PATH}"
+	fi
+else
+	echo "$0: Not going to add '${NAME}' to distribution list, is JavaSE project."
 fi
 
 if [ ! -f "${DIST}" ]
@@ -95,13 +85,17 @@ do
 	else
 		echo "$0: Project '${project}' not found."
 	fi
-
 done
 
-if [ "$1" != "r" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]
+if [ "$1" = "r" -o "${NAME}" = "jcore" -o "${NAME}" = "jcore-swing" ]
+then
+	echo "$0: Not uploading '${NAME}' or parameter 'r' provided."
+elif [ -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_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}"
+	scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" || exit 255
+else
+	echo "$0: SSH upload disabled."
 fi
 
 # Copy module.xml ...