From 97c1c6379668a0d22905551988e4876163f4438c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 26 Jun 2017 21:02:35 +0200
Subject: [PATCH 1/1] Some fixes: - Such senstive informations should be kept
 in configuration files ... ;-) - also only libs (typical commit for me) can
 be committed without modifying   script - other fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 commit-jprojects.sh    | 12 ++++++++++-
 dist.sh                | 47 ++++++++++++++++++++++++++++++++++--------
 fix-project-remotes.sh |  2 +-
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/commit-jprojects.sh b/commit-jprojects.sh
index 99f58bd..deff10f 100755
--- a/commit-jprojects.sh
+++ b/commit-jprojects.sh
@@ -19,10 +19,20 @@ for project in ${LIST}; do
 	if [ -n "${CHECK_CHANGES}" ]
 	then
 		echo "$0: Committing '${project}' ..."
-		if [ -n "$1" ]
+		if [ "$1" = "updated jar(s)" ]
 		then
+			# Special commit ... (known-binaries)
+			git commit --signoff -S lib/*.jar -m "$1"
+		elif [ -n "$1" -a -n "$2" ]
+		then
+			# Regular commit with given message
+			git commit $2 --signoff -S -m "$1" || exit 255
+		elif [ -n "$1" ]
+		then
+			# Regular commit with given message
 			git commit -a --signoff -S -m "$1" || exit 255
 		else
+			# Regular commit, will open $EDITOR for commit message
 			git commit -a --signoff -S || exit 255
 		fi
 	else
diff --git a/dist.sh b/dist.sh
index 0038723..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"
 
@@ -16,17 +19,43 @@ WILDFLY_MODULE_PATH="${WILDFLY_MODULE_BASE_PATH}/${NAME}/main"
 WILDFLY_MODULE_XML_FILE="wildfly/module.xml"
 
 # Glassfish base path (domain)
-GLASSFISH_BASE_PATH="${HOME}/gf_domain/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"
+GLASSFISH_BASE_PATH="${HOME}/gf_domain/lib"
 
 # 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 ...
diff --git a/fix-project-remotes.sh b/fix-project-remotes.sh
index 1760685..acecde2 100755
--- a/fix-project-remotes.sh
+++ b/fix-project-remotes.sh
@@ -14,7 +14,7 @@ GIT_BRANCH="master"
 GIT_ORIGIN="origin"
 
 MEDIA_BASE="/media"
-MEDIA_NAME1="INTENSO"
+MEDIA_NAME1="Backup"
 MEDIA_NAME2="Transport"
 MEDIA_PATH="Java Project"
 
-- 
2.30.2