From: Roland Häder <roland@mxchange.org>
Date: Mon, 18 Apr 2016 14:23:26 +0000 (+0200)
Subject: Cotinued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef629cf3b1c6bce2a53595ace94394bc9200ad52;p=jphone-core.git

Cotinued:
- updated dist.st: skip wild-fly creation if path not found
- updated jar(s)
---

diff --git a/dist.sh b/dist.sh
index 54fcb45..b74103b 100755
--- a/dist.sh
+++ b/dist.sh
@@ -29,7 +29,6 @@ PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib"
 
 # Generate list
 LIST=`find ../*/lib/${NAME}.jar`
-LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`"
 LIST="${LIST} ${WILDFLY_MODULE_PATH}"
 
 if [ -d "${GLASSFISH_BASE_PATH}" ]
@@ -38,12 +37,6 @@ then
 	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}"
-fi
-
 if [ ! -f "${DIST}" ]
 then
 	echo "$0: '${DIST}' not found."
@@ -51,12 +44,17 @@ then
 elif [ ! -d "${WILDFLY_MODULE_BASE_PATH}" ]
 then
 	echo "$0: WildFly base path '${WILDFLY_MODULE_BASE_PATH}' not created."
-	exit 1
 elif [ ! -d "${WILDFLY_MODULE_PATH}" ]
 then
 	mkdir -vp "${WILDFLY_MODULE_PATH}"
 fi
 
+if [ -d "${PERSONAL_DOMAIN_PATH}" ]
+then
+	echo "$0: Personal domain found, copying file '${DIST}' ..."
+	cp -v "${DIST}" "${PERSONAL_DOMAIN_PATH}"
+fi
+
 for project in ${LIST};
 do
 	if [ -d "${project}" ]
@@ -71,7 +69,7 @@ do
 
 done
 
-if [ -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
+if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
 then
 	echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
 	scp "${DIST}" "${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}"
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index bf510f6..4dc8393 100644
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ
diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index d066cb3..b26a4de 100644
Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ