From 93433f817474422923bb138f56af60dd3ce5b60a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2016 16:23:51 +0200 Subject: [PATCH] Cotinued: - updated dist.st: skip wild-fly creation if path not found - updated jar(s) --- dist.sh | 16 +++++++--------- lib/juser-core.jar | Bin 40898 -> 44272 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/juser-core.jar b/lib/juser-core.jar index 07acdec300c73fda85315fa9de7294503405372f..0caa78e5080bd8602d99888ea80611142cf4166d 100644 GIT binary patch delta 4423 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