updated dist.sh: SSH upload is now fully optional

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/.gitignore b/.gitignore
index cf4a7c5b0dae6e64df0a9d42472e823cbac70ce2..1653e829d756e1a9d547743c494dc8559e8fe9b6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
-nbproject/private/
-nbproject/faces-config.NavData
-nbproject/genfiles.properties
-nbproject/*~
+/nbproject/private/
+/nbproject/faces-config.NavData
+/nbproject/genfiles.properties
+/nbproject/*~
 /manifest.mf
 /build/
 /dist/
 /data/*
 /*.properties
 .~lock*
+*.tmp
 .gitcommits
+

diff --git a/dist.sh b/dist.sh
index 5097f6f56c613de3a1c900fc5d4d881c8854f02f..020632245ccde3fbe87beb4d42f945c31d16e8b3 100755 (executable)
--- a/dist.sh
+++ b/dist.sh
@@ -29,31 +29,16 @@ if [ ! -f "${DIST_CONFIG_FILE}" ]
 then
        echo "$0: Configuration file '${DIST_CONFIG_FILE}' not found"
        echo
-       echo "Following variables are needed:"
+       echo "Following variables are needed for SSH upload:"
        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
+       sleep 3
+else
+       # Load it
+       source "${DIST_CONFIG_FILE}"
 fi
 
 # Generate list
@@ -95,13 +80,17 @@ do
        else
                echo "$0: Project '${project}' not found."
        fi
-
 done
 
-if [ "$1" != "r" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]
+if [ -n "${GLASSFISH_SSH_USER}" -a -n "${GLASSFISH_SSH_SERVER}" -a -n "${GLASSFISH_SSH_PATH}" ]
 then
-       echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
-       scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}"
+       if [ "$1" != "r" -a "${NAME}" != "jcore" -a "${NAME}" != "jcore-swing" ]
+       then
+               echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
+               scp "${DIST}" "${GLASSFISH_SSH_USER}@${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}" || exit 255
+       fi
+else
+       echo "$0: SSH upload disabled."
 fi
 
 # Copy module.xml ...