From ac84ae3dd63763ad1d2c29bed9f0e23650f9b8b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 26 Jun 2017 21:02:26 +0200 Subject: [PATCH] updated dist.sh MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- dist.sh | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dist.sh b/dist.sh index 993d125..5097f6f 100755 --- a/dist.sh +++ b/dist.sh @@ -6,6 +6,9 @@ NAME="${PWD##*/}" # Generated JAR file DIST="dist/${NAME}.jar" +# Configuration file +DIST_CONFIG_FILE="${HOME}/.jprojects-dist.sh" + # WildFly module base path WILDFLY_MODULE_BASE_PATH="${HOME}/wildfly_domain/modules/org/mxchange" @@ -18,15 +21,41 @@ WILDFLY_MODULE_XML_FILE="wildfly/module.xml" # Glassfish base path (domain) GLASSFISH_BASE_PATH="${HOME}/gf_domain/lib" -# Remote Glassfish path -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" +# Is the configuration file there? +if [ ! -f "${DIST_CONFIG_FILE}" ] +then + echo "$0: Configuration file '${DIST_CONFIG_FILE}' not found" + echo + echo "Following variables are needed:" + echo "- GLASSFISH_SSH_PATH" + echo "- GLASSFISH_SSH_USER" + echo "- GLASSFISH_SSH_SERVER" + echo + echo "And create a password-less SSH key." + exit 1 +fi + +# Load it +source "${DIST_CONFIG_FILE}" + +# All set? +if [ -z "${GLASSFISH_SSH_PATH}" ] +then + echo "$0: Variable GLASSFISH_SSH_PATH not set." + exit 1 +elif [ -z "${GLASSFISH_SSH_USER}" ] +then + echo "$0: Variable GLASSFISH_SSH_USER not set." + exit 1 +elif [ -z "${GLASSFISH_SSH_SERVER}" ] +then + echo "$0: Variable GLASSFISH_SSH_SERVER not set." + exit 1 +fi + # Generate list LIST=$(find ../*/lib/${NAME}.jar) LIST="${LIST} ${WILDFLY_MODULE_PATH}" @@ -69,10 +98,10 @@ do done -if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ] +if [ "$1" != "r" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ] then echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..." - scp "${DIST}" "${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" + scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" fi # Copy module.xml ... -- 2.39.5