From 084dbe0aa989a291e219bdf4bba12b07042d3742 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 18 Apr 2016 20:54:22 +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 | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 12 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 3f4dfa2..54fcb45 100755 --- a/dist.sh +++ b/dist.sh @@ -24,6 +24,9 @@ GLASSFISH_SSH_PATH="/var/payara/domains/domain1/lib" # Remote SSH server (password-less access) GLASSFISH_SSH_SERVER="www.mxchange.org" +# Windows personal domain +PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib" + # Generate list LIST=`find ../*/lib/${NAME}.jar` LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`" @@ -35,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." @@ -48,24 +57,21 @@ then mkdir -vp "${WILDFLY_MODULE_PATH}" fi -for target in ${LIST}; +for project in ${LIST}; do - if [ -d "${target}" ] + if [ -d "${project}" ] then - cp -v "${DIST}" "${target}" - elif [ -f "${target}" ] + cp -v "${DIST}" "${project}" + elif [ -f "${project}" ] then - cp -v "${DIST}" "${target}" + cp -v "${DIST}" "${project}" else - echo "$0: Target '${target}' not found." + echo "$0: Project '${project}' not found." fi done -# Testing on project name -SKIP_TEST="${NAME:0:9}" - -if [ -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" -a "${SKIP_TEST}" != "jratecalc" ] +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