From ef629cf3b1c6bce2a53595ace94394bc9200ad52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2016 16:23:26 +0200 Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path not found - updated jar(s) --- dist.sh | 16 +++++++--------- lib/jcoreee.jar | Bin 24632 -> 24623 bytes lib/jcountry-core.jar | Bin 9970 -> 9961 bytes 3 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/jcoreee.jar b/lib/jcoreee.jar index bf510f6b3a31aa5760af4d6b2b2bbef9b5f88e4f..4dc8393e1ba1feb3d6be7b2e89a27b2f2b69ae77 100644 GIT binary patch delta 1116 zcmaJ=ZAep57(VwL=Un^V91?fzs*#S=xtOsJv$1p}N~nWa`?|wo=nrco{Sf@Ijeb|m z7owmb!G4OA{pbUS_5}qYf>20B8WjBy`d3h7_nf0)9DvOV+bJ{^apnO3u;S36-cOO^he@hkILf)I^f7}5Gcw5#vgbA+wFivD=ArACN`4@Pk_3n z6(#vreQK(i32ld-NpIQ7vCiQ^4%d^a^9qJu!T4NeoSQm3K6-vEvnSPt3>7ln&CJ0H z-_X9-W{yffqJ%z1fIO!?^nZPg3QC?*nvJ{mfP9R{B@T*06O>}iTzD;&esVCIY5`MR zE(viS_h44K>NOgara(?wy^Pt6rMQ)T4xog!N=Xe4V$dsuGENhL&9oDy61v9SU!z^2 zJwqE^|7hP#@OXhx>%d*RA6!Wbn-jkqK5jE1MB`|64nlK<4z1MegX>8P6FHyc@l9ST zg~6DT59&zqctVhl5`a}vCs0{8A{#1RhY*cpig9yrJ0;)$ZxW5~D*Mw0q9`lbGHl=Z zDqS8LJqqe$f7vcI*n?(xDawjIh&l`DHD@@nv|SlQ#@IB#uR0Rsa=!9*uNMze_%Mfr?$ zGxJJPi}Dh4bdwBBC$3gz2CAEQQ65Zv)&NnHE zn%yWGR8TaqFin0KX#{rCsVHeCHxO5Ca)2p6ADZ*EqNSOpF@a16#lhs=Q4rUGG~I#; zi%yn}<^r1qQmw@dRIM>NKN_O44k(ld5;B;4I+_dYkNoZH*mc+$7(mzr?kom|C5<~k z3dJYab4X5BjS&JHX%!>QWX25)2aC!5F+%d7aQL6mw>F;{7~DYYjG}+(T~-DL5DrDrreXpOBJIhR z@erqF#Yr;?+E1ObKhCfA4ZP8LoOV_OvtG7kWA?;b<| 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 zExOZYN^ z8QGG(tYF4(xwp(9#^l#Z7N{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@0xiOjcJm1v(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