From e8bc4f994e10b0d70f3e1123904360d5fb45c3b3 Mon Sep 17 00:00:00 2001 From: Mark Liu Date: Wed, 17 May 2017 14:24:25 -0700 Subject: [PATCH 1/2] [BEAM-2164] Fix generate-sources.sh if directory contains space --- sdks/java/maven-archetypes/examples-java8/generate-sources.sh | 2 +- sdks/java/maven-archetypes/examples/generate-sources.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/java/maven-archetypes/examples-java8/generate-sources.sh b/sdks/java/maven-archetypes/examples-java8/generate-sources.sh index 58c5f22298b7..22b3f64eabd9 100755 --- a/sdks/java/maven-archetypes/examples-java8/generate-sources.sh +++ b/sdks/java/maven-archetypes/examples-java8/generate-sources.sh @@ -22,7 +22,7 @@ # Usage: Invoke with no arguments from any working directory. # The directory of this script. Assumes root of the maven-archetypes module. -HERE="$(dirname $0)" +HERE="$( cd "$( dirname '$0' )" && pwd )" # The directory of the examples-java and examples-java8 modules EXAMPLES_ROOT="${HERE}/../../../../examples/java" diff --git a/sdks/java/maven-archetypes/examples/generate-sources.sh b/sdks/java/maven-archetypes/examples/generate-sources.sh index d9109ac313c2..40a07c35e010 100755 --- a/sdks/java/maven-archetypes/examples/generate-sources.sh +++ b/sdks/java/maven-archetypes/examples/generate-sources.sh @@ -21,7 +21,7 @@ # Usage: Invoke with no arguments from any working directory. # The directory of this script. Assumes root of the maven-archetypes module. -HERE="$(dirname $0)" +HERE="$( cd "$( dirname '$0' )" && pwd )" # The directory of the examples-java module EXAMPLES_ROOT="${HERE}/../../../../examples/java" From 8b27b3150ef309ddf8f3ec9913395b25124b24fa Mon Sep 17 00:00:00 2001 From: Mark Liu Date: Thu, 18 May 2017 15:28:43 -0700 Subject: [PATCH 2/2] fixup! Use dirname instead of pwd --- sdks/java/maven-archetypes/examples-java8/generate-sources.sh | 2 +- sdks/java/maven-archetypes/examples/generate-sources.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/java/maven-archetypes/examples-java8/generate-sources.sh b/sdks/java/maven-archetypes/examples-java8/generate-sources.sh index 22b3f64eabd9..d8117ce5f266 100755 --- a/sdks/java/maven-archetypes/examples-java8/generate-sources.sh +++ b/sdks/java/maven-archetypes/examples-java8/generate-sources.sh @@ -22,7 +22,7 @@ # Usage: Invoke with no arguments from any working directory. # The directory of this script. Assumes root of the maven-archetypes module. -HERE="$( cd "$( dirname '$0' )" && pwd )" +HERE="$( dirname "$0" )" # The directory of the examples-java and examples-java8 modules EXAMPLES_ROOT="${HERE}/../../../../examples/java" diff --git a/sdks/java/maven-archetypes/examples/generate-sources.sh b/sdks/java/maven-archetypes/examples/generate-sources.sh index 40a07c35e010..62af772884f5 100755 --- a/sdks/java/maven-archetypes/examples/generate-sources.sh +++ b/sdks/java/maven-archetypes/examples/generate-sources.sh @@ -21,7 +21,7 @@ # Usage: Invoke with no arguments from any working directory. # The directory of this script. Assumes root of the maven-archetypes module. -HERE="$( cd "$( dirname '$0' )" && pwd )" +HERE="$( dirname "$0" )" # The directory of the examples-java module EXAMPLES_ROOT="${HERE}/../../../../examples/java"