X-Git-Url: https://git.mxchange.org/?p=jprojects-scripts.git;a=blobdiff_plain;f=dist.sh;h=5ea9f343efdd50bc5239730932bbae1d5cafbdf8;hp=54fcb45ee6d5934048cb19c4ca4aff6d565785a4;hb=dcb3f1861ead93598bb7e1a030d30410b2f8b71f;hpb=2674d9b3266d9849a69284f43d3f8bbd1c3154c9;ds=sidebyside diff --git a/dist.sh b/dist.sh index 54fcb45..5ea9f34 100755 --- a/dist.sh +++ b/dist.sh @@ -28,8 +28,7 @@ GLASSFISH_SSH_SERVER="www.mxchange.org" PERSONAL_DOMAIN_PATH="${HOME}/personal_domain/lib" # Generate list -LIST=`find ../*/lib/${NAME}.jar` -LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`" +LIST=$(find ../*/lib/${NAME}.jar) LIST="${LIST} ${WILDFLY_MODULE_PATH}" if [ -d "${GLASSFISH_BASE_PATH}" ] @@ -51,7 +50,6 @@ 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}" @@ -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}" @@ -81,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