updated jar(s)

[jcustomer-lib.git] / dist.sh

diff --git a/dist.sh b/dist.sh
index b74103bd5ef8d1d60f12bf88c5dd2ac62f89c63b..0038723640d825d72d04d6a40506ee68cba14dd0 100755 (executable)
--- a/dist.sh
+++ b/dist.sh
@@ -28,7 +28,7 @@ GLASSFISH_SSH_SERVER="www.mxchange.org"
 PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib"
 
 # Generate list
-LIST=`find ../*/lib/${NAME}.jar`
+LIST=$(find ../*/lib/${NAME}.jar)
 LIST="${LIST} ${WILDFLY_MODULE_PATH}"
 
 if [ -d "${GLASSFISH_BASE_PATH}" ]
@@ -37,6 +37,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."
@@ -49,12 +55,6 @@ 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 +69,7 @@ do
 
 done
 
-if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
+if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]
 then
        echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
        scp "${DIST}" "${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}"
@@ -79,7 +79,7 @@ fi
 if [ -f "${WILDFLY_MODULE_XML_FILE}" ]
 then
        echo "$0: Generating module.xml ..."
-       XML_CONTENT=`cat "${WILDFLY_MODULE_XML_FILE}"`
+       XML_CONTENT=$(cat "${WILDFLY_MODULE_XML_FILE}")
        XML_CONTENT="${XML_CONTENT//NAME/$NAME}"
        echo "${XML_CONTENT}" > "${WILDFLY_MODULE_PATH}/module.xml"
 fi