diff options
| author | ronshapiro <ronshapiro@google.com> | 2020-04-16 03:18:36 -0700 |
|---|---|---|
| committer | David P. Baker <dpb@google.com> | 2020-04-20 14:51:53 -0400 |
| commit | dfffce66828a476744cbeba1634d0f73f2e03ad5 (patch) | |
| tree | 9ab6353bb983ebf92f62d9a3b153d4dc6552e26e /util | |
| parent | 8896fe0eaed5d3e12e82d0927acf8b36bedbdcf9 (diff) | |
| download | dagger2-dfffce66828a476744cbeba1634d0f73f2e03ad5.tar.gz | |
Fix deploy script
It seems like the issue was the command generated could sometimes have a trailing empty string as mentioned [here](https://github.com/google/dagger/issues/1809#issuecomment-613337248)
mvn install:install-file -Dfile=bazel-bin/java/dagger/libcore.jar -Djavadoc=bazel-bin/java/dagger/core-javadoc.jar -DpomFile=bazel-bin/java/dagger/pom.xml -Dsources=bazel-bin/java/dagger/libcore-src.jar ''
Fixes https://github.com/google/dagger/issues/1809
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=306814159
Diffstat (limited to 'util')
| -rwxr-xr-x | util/deploy-dagger.sh | 4 | ||||
| -rwxr-xr-x | util/deploy-hilt.sh | 4 | ||||
| -rwxr-xr-x | util/deploy-library.sh | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/util/deploy-dagger.sh b/util/deploy-dagger.sh index 4094763a1..141c22bcc 100755 --- a/util/deploy-dagger.sh +++ b/util/deploy-dagger.sh @@ -5,7 +5,7 @@ set -eu readonly MVN_GOAL="$1" readonly VERSION_NAME="$2" shift 2 -readonly EXTRA_MAVEN_ARGS=$([ $# -gt 0 ] && echo "$@" || echo "") +readonly EXTRA_MAVEN_ARGS=("$@") # Builds and deploys the given artifacts to a configured maven goal. # @param {string} library the library to deploy. @@ -26,7 +26,7 @@ _deploy() { "$javadoc" \ "$MVN_GOAL" \ "$VERSION_NAME" \ - "$EXTRA_MAVEN_ARGS" + "${EXTRA_MAVEN_ARGS[@]:+${EXTRA_MAVEN_ARGS[@]}}" } _deploy \ diff --git a/util/deploy-hilt.sh b/util/deploy-hilt.sh index 9c9807127..29fc01614 100755 --- a/util/deploy-hilt.sh +++ b/util/deploy-hilt.sh @@ -5,7 +5,7 @@ set -eu readonly MVN_GOAL="$1" readonly VERSION_NAME="$2" shift 2 -readonly EXTRA_MAVEN_ARGS=$([ $# -gt 0 ] && echo "$@" || echo "") +readonly EXTRA_MAVEN_ARGS=("$@") # Builds and deploys the given artifacts to a configured maven goal. # @param {string} library the library to deploy. @@ -26,7 +26,7 @@ _deploy() { "$javadoc" \ "$MVN_GOAL" \ "$VERSION_NAME" \ - "$EXTRA_MAVEN_ARGS" + "${EXTRA_MAVEN_ARGS[@]:+${EXTRA_MAVEN_ARGS[@]}}" } _deploy \ diff --git a/util/deploy-library.sh b/util/deploy-library.sh index 885da36b8..73e4749c2 100755 --- a/util/deploy-library.sh +++ b/util/deploy-library.sh @@ -16,7 +16,8 @@ deploy_library() { local javadoc=$4 local mvn_goal=$5 local version_name=$6 - local extra_maven_args=${@:7} + shift 6 + local extra_maven_args=("$@") bazel build --define=pom_version="$version_name" \ $library $pomfile |