From b199afcd7e2fc30d6beb7c2bfd594c8191c1e33b Mon Sep 17 00:00:00 2001 From: Nicolas Barithel Date: Fri, 5 Apr 2019 14:36:09 +0200 Subject: [PATCH] Allow working directory to include whitespaces --- .../main/resources/archetype-resources/run.sh | 24 +++++++++---------- .../main/resources/archetype-resources/run.sh | 12 +++++----- .../main/resources/archetype-resources/run.sh | 18 +++++++------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh index 56f0829e..d11437eb 100755 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh @@ -1,7 +1,7 @@ #set( $symbol_dollar = '$' ) #!/bin/sh -export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml +export COMPOSE_FILE_PATH="${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml" if [ -z "${symbol_dollar}{M2_HOME}" ]; then export MVN_EXEC="mvn" @@ -13,20 +13,20 @@ start() { docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-ass-volume - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d } start_share() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d ${rootArtifactId}-share + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share } start_acs() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d ${rootArtifactId}-acs + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs } down() { - if [ -f ${symbol_dollar}COMPOSE_FILE_PATH ]; then - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down fi } @@ -41,23 +41,23 @@ build() { } build_share() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share - yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share + yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker } build_acs() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-acs - yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-acs + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs + yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker } tail() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f } tail_all() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all" + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all" } prepare_test() { diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh index 14b7dcf6..9def3b95 100755 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -1,7 +1,7 @@ #set( $symbol_dollar = '$' ) #!/bin/sh -export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml +export COMPOSE_FILE_PATH="${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml" if [ -z "${symbol_dollar}{M2_HOME}" ]; then export MVN_EXEC="mvn" @@ -13,12 +13,12 @@ start() { docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-ass-volume - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d } down() { - if [ -f ${symbol_dollar}COMPOSE_FILE_PATH ]; then - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down fi } @@ -33,11 +33,11 @@ build() { } tail() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f } tail_all() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all" + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all" } prepare_test() { diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh index 4e2add75..493a5146 100755 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -1,7 +1,7 @@ #set( $symbol_dollar = '$' ) #!/bin/sh -export COMPOSE_FILE_PATH=${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml +export COMPOSE_FILE_PATH="${symbol_dollar}{PWD}/target/classes/docker/docker-compose.yml" if [ -z "${symbol_dollar}{M2_HOME}" ]; then export MVN_EXEC="mvn" @@ -13,16 +13,16 @@ start() { docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume docker volume create ${rootArtifactId}-ass-volume - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d } start_share() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH up --build -d ${rootArtifactId}-share + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share } down() { - if [ -f ${symbol_dollar}COMPOSE_FILE_PATH ]; then - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down + if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down fi } @@ -37,17 +37,17 @@ build() { } build_share() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share - yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share + yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share ${symbol_dollar}MVN_EXEC clean package } tail() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs -f + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f } tail_all() { - docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH logs --tail="all" + docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all" } case "${symbol_dollar}1" in