From a0c0cda9d839afb940f53e5b641420733753e3a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2016 16:23:29 +0200 Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path not found - updated jar(s) --- dist.sh | 16 +++++++--------- lib/jphone-core.jar | Bin 29311 -> 29302 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/jphone-core.jar b/lib/jphone-core.jar index 412151183b1e8df79a1bfcf16d84ed0aee672d82..f61cf885eebe4b8c1b174e893607135fff74914d 100644 GIT binary patch delta 1174 zcmZWmT}YEr7(UZg>$X<-nky z8|Osn1P1WJb$< zt-`cf%M)ml8}mi!7-o-L1HThyb724{El7SWTIngw?KFsals4gHHn8w{;CpBN4uibk zBcI^>7YR8l;bGnIOvXdrRBgn=tfgNdA>|uI11s>Sp{aI4*TxWs*ckr!I)G5HzkurKil1- z(g9v{K&q#hUls-!G$p}0b-?Q$GeUC=+7M8Xnw>fcowFL<)DQ$?-v6A{={Q3aC;jQ& z12Zu(Z6T)8c@BHQ9v7at%}SZsEQfHs0zF-itF)a%{8~j|PZ%LDA2_^gxy?^L%nhEC z3E^?FFqx3??2=(evm0$LK5dG>V~@sT=e@?Ww@r+E5QY;zBtE+TV5EvE@(AfvCoGIu z4QnMTlvs;kDq+TkPoEpl4^u*T_;d{}1s5<8u)?k6UcB09Ql(ZK!a-ULVOtrbQbOlT z%lzqPrh%c;Y0$7?P}4XWb#A0oy5fXTOoQP%h0CLt%{zTVN+}^cygH3B7m`<9C2%h( zG|u#@)Zj;H{zlDlrwDME_FzoV0gU(PDU8cBjIoAYPO{Qg zQd*g&BD?g{wV>eUeqCD)Zr*CQBr@n;V~7~u4i9dIJ4zDSI{KQ5W=qe5NgY$}@HdHU z4!w~`DeiY;>ciN)EI64uSEF!0;6-N8X$Wj*`UMw4rs4a@Ey_<#^dw@Gc@^oR$R$mK zZo+NTkIV(AmeKX?1Ac zOHIV9b^SM-Llks~D8nHmULUBFDqfK>X|T(GVGZuETJ7Ia#a&vQFe?d(i%okr>vc5y zB1J24e{in}omR9%BpX5pi&=vv`I`^)oC=HCW75~G!PZ@P3Oy%3!b>@W*>wn&wf(SD z-wq48Mr6O^saIMh)eVa|c{w4=U?SgI7G&ET_IWFC7yPy)dzZt}4ul^yhaj16 z42bK@9jb2`r-XV$}O+EMuztQM}|tgS_ZJ&B`yCEh2b_>IkaKl{%pgot(CAzdD;ko_=M m-vC?1Mik7vd^)t@B1Ei{4#7l<3)