From 37a578649128eb0387a41dbbcb8f9bf066f6e9d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 18 Apr 2016 16:23:06 +0200
Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path
 not found - updated jar(s)

---
 dist.sh               |  16 +++++++---------
 lib/jcountry-core.jar | Bin 9970 -> 9961 bytes
 2 files changed, 7 insertions(+), 9 deletions(-)

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/jcountry-core.jar b/lib/jcountry-core.jar
index d066cb3bc6e0a23c6fd9bf782735639902172b45..b26a4ded3c3d45622294c5f90012db5cd967dcd7 100644
GIT binary patch
delta 548
zcmez5`_h*;z?+$ci-CcIf#FW$q=~#5ytf-Cc^s}j=AX{Mz>q%C$&b-w;zUtabKN8Z
z<B408nL(;<$%Cms8X#)2I-?<&j%G9i(^D8N!1Q@W8xXyjkBNf?%#dXJF9>ExOZYN^
z8QGG(tYF4(xwp(9#^l#Z7N{<mY@lpv3Y75xItLC|;4A@#w~j}Ey!@hc{Qz%9CJ|=1
zXC}{5mbQ5YmCLP2&PdElPeoURVyqa7v4WF7DyxDWC8;9K=nCXXPIh2p)kd=h#RORt
z6Y9Wv*2%C>o~ObCHfb%;q@7^V^=jOc-$F(I07ZX5&F7hHt16@b@^JJ;3(FmX3=ANw
z12>m}VM!x1+hhYZ37})dCeKxc7`#SRnu%2cD6BHsPeL5SjdHE;6D?U87{D0CtkB8&
bY93&>RjElcJ(U9*Avt-2nho1!C6GD*X>yn%

delta 503
zcmaFq`^lF#z?+$ci-CcIfnm+co{78~ysKCCcsR~m+g8B9z)&#J$&b-&;zUtCBi+or
zlGLKS#2nou1JjACm6<`xFUo_d&l(_VvK*r!m=0nz1Jm7%7GU}qqYa4O%*w>U0%i!X
z{TBo?gd}_!!HguyURE&UliXWo5M%NqB@0xiOjcJm1<S-MON*ZcIxfE`T|dB^kx7IZ
z?*7RWm8BWqPhP7m16FxPS(-_TadIM~1V6e$0TpQ`KaiCCWFHkSu<A&lP&?yfMG1Lr
zG}RtJ+u%SE&JtjF>v(AL0TlxUpo2YDd^^v1l$n76gf-x57#Nl`GBN?}k)7Ni#Xi|Y
zRS0aCr>Zm)4;x&#OH~YP2ESHI!%v`I5Vk}ygHHnJFzd;`Re8YrxzwbY;v^>*N?K$1
gtPm*mPHr-zysKD%H!B;+6kZ@?U}0dmqXgms0Iy4ohyVZp

-- 
2.39.5