From 13a7eb9e5ac0467dc907d526d6015ad74dd2d104 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 15 Aug 2017 22:54:28 +0200
Subject: [PATCH] updated dist.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
dist.sh | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/dist.sh b/dist.sh
index 0206322..b5df710 100755
--- a/dist.sh
+++ b/dist.sh
@@ -45,16 +45,21 @@ fi
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}" ]
@@ -82,13 +87,12 @@ do
fi
done
-if [ -n "${GLASSFISH_SSH_USER}" -a -n "${GLASSFISH_SSH_SERVER}" -a -n "${GLASSFISH_SSH_PATH}" ]
+if [ "$1" = "r" -o "${NAME}" = "jcore" -o "${NAME}" = "jcore-swing" ]
then
- 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
+ echo "$0: Not uploading '${NAME}' or parameter 'r' provided."
+elif [ -n "${GLASSFISH_SSH_USER}" -a -n "${GLASSFISH_SSH_SERVER}" -a -n "${GLASSFISH_SSH_PATH}" ]
+ echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
+ scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" || exit 255
else
echo "$0: SSH upload disabled."
fi
--
2.39.5