Merge pull request #147 from vorburger/DEPLOYMENTS_DIR

make DEPLOYMENTS_DIR overridable (#146)
fabric8io-images · May 15, 2018 · 5804783 · 5804783
2 parents de582c8 + be778c1
commit 5804783
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/java/images/jboss/s2i/assemble b/java/images/jboss/s2i/assemble
@@ -241,7 +241,7 @@ function build_gradle() {
 
 echo "=================================================================="
 echo "Starting S2I Java Build ....."
-mkdir -p ${DEPLOYMENTS_DIR}
+[ -d "${DEPLOYMENTS_DIR}" ] || mkdir -p "${DEPLOYMENTS_DIR}"
 if [ -f "${S2I_SOURCE_DIR}/pom.xml" ]; then
   echo "S2I source build for Maven detected"
   build_dir=$(get_maven_output_dir)

diff --git a/java/images/rhel/s2i/assemble b/java/images/rhel/s2i/assemble
@@ -170,7 +170,7 @@ function build_maven() {
 
 echo "=================================================================="
 echo "Starting S2I Java Build ....."
-mkdir -p ${DEPLOYMENTS_DIR}
+[ -d "${DEPLOYMENTS_DIR}" ] || mkdir -p "${DEPLOYMENTS_DIR}"
 if [ -f "${S2I_SOURCE_DIR}/pom.xml" ]; then
   echo "S2I source build for Maven detected"
   build_dir=$(get_maven_output_dir)

diff --git a/java/templates/s2i/assemble b/java/templates/s2i/assemble
@@ -241,7 +241,7 @@ function build_gradle() {
 
 echo "=================================================================="
 echo "Starting S2I Java Build ....."
-mkdir -p ${DEPLOYMENTS_DIR}
+[ -d "${DEPLOYMENTS_DIR}" ] || mkdir -p "${DEPLOYMENTS_DIR}"
 if [ -f "${S2I_SOURCE_DIR}/pom.xml" ]; then
   echo "S2I source build for Maven detected"
   build_dir=$(get_maven_output_dir)