From 0e90d9a5295b0d8865c38afd1ae29c7211c10f26 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 18 Apr 2016 20:52:51 +0200 Subject: [PATCH 1/1] Continued: - line-feed is now LF which prevents converting - updated dist.sh for better personal-domain support - updated jar(s) --- .gitattributes | 4 ++-- dist.sh | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitattributes b/.gitattributes index dfe0770..17cdcd5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -# Auto detect text files and perform LF normalization -* text=auto +# Use Linux/Uni* line-feed for new lines (prevents converting) +* text=lf diff --git a/dist.sh b/dist.sh index b74103b..54fcb45 100755 --- a/dist.sh +++ b/dist.sh @@ -29,6 +29,7 @@ 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}" ] @@ -37,6 +38,12 @@ 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." @@ -44,17 +51,12 @@ 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}" ] @@ -69,7 +71,7 @@ do done -if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ] +if [ -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}" -- 2.39.2