X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=.jprojects.sh;h=e3a416ab3f880359d1655be8f4a3f6bc77c5c72a;hb=71b241cd517fdd089070f584b28f0c4383f72ced;hp=bd8830baf8bc5ba3910c1b172bf4c695ae4227ec;hpb=a7db368fbd5d303995057d85c7faca17f90d071e;p=jprojects-scripts.git

diff --git a/.jprojects.sh b/.jprojects.sh
index bd8830b..e3a416a 100644
--- a/.jprojects.sh
+++ b/.jprojects.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-# Tools repository
-LIST="jprojects-scripts"
+# Tools repository (this)
+THIS="jprojects-scripts"
 
 # Libraries and EJBs
-LIST="${LIST} \
-	jcore jcoreee \
+LIBRARIES="jcore jcoreee \
 	jcore-logger-lib jcore-logger-ejb \
 	jcountry-core jcountry-lib \
 	jphone-core jphone-lib \
@@ -21,27 +20,39 @@ LIST="${LIST} \
 	jshop-receipt-lib jshop-receipt-ejb"
 
 # Applications and their special libs/EJBs
-LIST="${LIST}
-	pizzaservice-core pizzaservice-lib pizzaservice-mailer pizzaservice-ejb pizzaservice-swing \
+APPLICATIONS="pizzaservice-core pizzaservice-lib pizzaservice-mailer pizzaservice-ejb pizzaservice-swing \
 	jjobs-core jjobs-lib jjobs-mailer jjobs-ejb jjobs-war jjobs \
-	jrecruiter-core jrecruiter-lib jrecruiter-mailer jrecruiter-ejb jrecruiter-war jrecruiter \
+	addressbook-core addressbook-lib addressbook-mailer addressbook-ejb addressbook-war addressbook addressbook-uml"
+
+# Company-specific projects
+COMPANY_APPS="jrecruiter-core jrecruiter-lib jrecruiter-mailer jrecruiter-ejb jrecruiter-war jrecruiter \
 	jratecalc-core jratecalc-lib jratecalc-mailer jratecalc-ejb jratecalc-war jratecalc \
 	jlandingpage-core jlandingpage-lib jlandingpage-mailer jlandingpage-ejb jlandingpage-war jlandingpage \
 	jcalculator-core jcalculator-lib jcalculator-mailer jcalculator-ejb jcalculator-war jcalculator \
-	jreports-core jreports-lib jreports-mailer jreports-ejb jreports-war jreports \
-	addressbook-core addressbook-lib addressbook-mailer addressbook-ejb addressbook-war addressbook addressbook-uml"
+	jreports-core jreports-lib jreports-mailer jreports-ejb jreports-war jreports"
 
-# BROKEN:
-LIST="${LIST} addressbook-swing pizzaservice-war pizzaservice"
+# Broken (needs fixing)
+BROKEN="addressbook-swing pizzaservice-war pizzaservice"
+
+# Compile list
+ALL_PROJECTS="${THIS} ${LIBRARIES} ${APPLICATIONS} ${COMPANY_APPS} ${BROKEN}"
 
 # Own home directory
 declare -r JPROJECTS_HOME="${PWD}"
 
 # ant binary
-ANT_BIN=`which ant 2>/dev/null`
+ANT_BIN=$(which ant 2>/dev/null)
+
+# Check binary
+if [ -z "${ANT_BIN}" ]
+then
+	echo "$0: Cannot find ANT binary."
+	exit 1
+fi
 
 # Test on .git availability"
-for project in ${LIST}; do
+LIST=""
+for project in ${ALL_PROJECTS}; do
 	if [ ! -d "${project}" ]
 	then
 		echo "$0: Project '${project}' not created."
@@ -50,4 +61,7 @@ for project in ${LIST}; do
 		echo "$0: Project '${project}' is no GIT project."
 		exit 1
 	fi
+
+	# Add it as available
+	LIST="${LIST} ${project}"
 done