From 8a2d88a984dd27501bcbd3701b27d4d5d3b1ac5a Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 27 Jul 2016 21:31:02 +0200 Subject: [PATCH] Continued: - added new bundle-jprojects.sh which will bundle all Java projects in parent directory - added check for project existence and that it is not *this* project - deleted wildfly stuff Signed-off-by: Roland Haeder --- build-dist-all.sh | 8 ++++++-- bundle-jprojects.sh | 24 ++++++++++++++++++++++++ check-untracked.sh | 16 ++++++++++++++-- checkout-jprojects.sh | 10 ++++++++++ commit-jprojects.sh | 7 ++++++- create-jproject-branch.sh | 7 ++++++- fix-project-remotes.sh | 7 ++++++- merge-jprojects.sh | 10 ++++++++++ wildfly/module.xml | 10 ---------- 9 files changed, 82 insertions(+), 17 deletions(-) create mode 100755 bundle-jprojects.sh delete mode 100644 wildfly/module.xml diff --git a/build-dist-all.sh b/build-dist-all.sh index aeb747e..c5ae10f 100755 --- a/build-dist-all.sh +++ b/build-dist-all.sh @@ -3,10 +3,14 @@ . ./.jprojects.sh || exit 255 for project in ${LIST}; do - if [ ! -d "${JPROJECTS_HOME}/${project}" ] + if [ "${project}" = "jprojects-scripts" ] + then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] then echo "$0: Project '${project}' does not exist." - continue; + continue fi echo "$0: Executing '${project}' ..." diff --git a/bundle-jprojects.sh b/bundle-jprojects.sh new file mode 100755 index 0000000..2435d50 --- /dev/null +++ b/bundle-jprojects.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +. ./.jprojects.sh || exit 255 + +for project in ${LIST}; do + if [ "${project}" = "jprojects-scripts" ] + then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." + continue + fi + + BUNDLE_FILE="${JPROJECTS_HOME}/${project}.bundle" + + echo "$0: Bundling '${project}' ..." + cd "${JPROJECTS_HOME}/${project}" + git bundle create "${BUNDLE_FILE}" HEAD +done + +echo "$0: All done." +exit 0 diff --git a/check-untracked.sh b/check-untracked.sh index 7216a7e..1bd186c 100755 --- a/check-untracked.sh +++ b/check-untracked.sh @@ -3,13 +3,25 @@ . ./.jprojects.sh for project in ${LIST}; do + if [ "${project}" = "jprojects-scripts" ] + then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." + continue + fi + echo "$0: Checking '${project}' ..." - cd "${project}" + cd "${JPROJECTS_HOME}/${project}" STATUS=`git status` UNTRACKED=`echo "${STATUS}" | grep "Untracked files:"` if [ -n "${UNTRACKED}" ] then echo "${STATUS}" fi - cd - done + +echo "$0: All done." +exit 0 diff --git a/checkout-jprojects.sh b/checkout-jprojects.sh index a577daa..4fb0da4 100755 --- a/checkout-jprojects.sh +++ b/checkout-jprojects.sh @@ -5,6 +5,16 @@ TARGET_BRANCH="master" for project in ${LIST}; do + if [ "${project}" = "jprojects-scripts" ] + then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." + continue + fi + echo "$0: Processing '${project}' ..." cd "${JPROJECTS_HOME}/${project}" diff --git a/commit-jprojects.sh b/commit-jprojects.sh index 8681064..802ea6a 100755 --- a/commit-jprojects.sh +++ b/commit-jprojects.sh @@ -3,8 +3,13 @@ . ./.jprojects.sh || exit 255 for project in ${LIST}; do - if [ ! -d "${JPROJECTS_HOME}/${project}" ] + if [ "${project}" = "jprojects-scripts" ] then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." continue fi diff --git a/create-jproject-branch.sh b/create-jproject-branch.sh index 873da98..3d14093 100755 --- a/create-jproject-branch.sh +++ b/create-jproject-branch.sh @@ -12,8 +12,13 @@ COMMIT_ADD="" AFTER_COMMIT_BRANCH="master" for project in ${LIST}; do - if [ ! -d "${JPROJECTS_HOME}/${project}" ] + if [ "${project}" = "jprojects-scripts" ] then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." continue fi diff --git a/fix-project-remotes.sh b/fix-project-remotes.sh index f4bd38b..5ebb413 100755 --- a/fix-project-remotes.sh +++ b/fix-project-remotes.sh @@ -19,8 +19,13 @@ MEDIA_NAME2="Transport" MEDIA_PATH="Java Project" for project in ${LIST}; do - if [ ! -d "${JPROJECTS_HOME}/${project}" ] + if [ "${project}" = "jprojects-scripts" ] then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." continue fi diff --git a/merge-jprojects.sh b/merge-jprojects.sh index 7257499..4fc5525 100755 --- a/merge-jprojects.sh +++ b/merge-jprojects.sh @@ -7,6 +7,16 @@ TARGET_BRANCH="rewrites/jpa" SWITCH_TO_SOURCE="Y" for project in ${LIST}; do + if [ "${project}" = "jprojects-scripts" ] + then + echo "$0: Skipping jprojects-scripts ..." + continue + elif [ ! -d "${JPROJECTS_HOME}/${project}" ] + then + echo "$0: Project '${project}' does not exist." + continue + fi + echo "$0: Processing '${project}' ..." cd "${JPROJECTS_HOME}/${project}" diff --git a/wildfly/module.xml b/wildfly/module.xml deleted file mode 100644 index 5bb8b82..0000000 --- a/wildfly/module.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - -- 2.39.5