From: Roland Häder <roland@mxchange.org>
Date: Wed, 16 Aug 2017 18:04:35 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0f8d671861eb60f92a77469608733ba91e524a84;p=jprojects-scripts.git

Continued:
- renamed jshop-ee-lib -> jshop-lib to follow "common" naming-convention
- jcore and jcore-swing are both JavaSE, maybe jcore is also compatible with
  JavaME, but both are *NEVER* compatible with JavaEE, so let's exclude them
  from any distribution lists

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/.jprojects.sh b/.jprojects.sh
index 1c32e0c..07fd2cc 100644
--- a/.jprojects.sh
+++ b/.jprojects.sh
@@ -20,7 +20,7 @@ LIBRARIES="jcore jcoreee \
 	jcore-swing \
 	jcustomer-core jcustomer-lib \
 	jproduct-core jproduct-lib \
-	jshop-core jshop-ee-lib \
+	jshop-core jshop-lib \
 	jshop-receipt-core jshop-receipt-lib"
 
 # Base application names (all)
diff --git a/dist.sh b/dist.sh
index 0206322..fdd1e5d 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,13 @@ 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}" ]
+then
+	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