From dc1f3117bb8248ef95a88a6481bf89b3183f9c4f Mon Sep 17 00:00:00 2001 From: Julien Nicoulaud Date: Tue, 19 Jul 2022 20:14:07 +0200 Subject: [PATCH] -agentpath/-javaagent options should be treated as Java options like -agentlib --- .../typesafe/sbt/packager/archetypes/scripts/ash-template | 6 +++--- .../typesafe/sbt/packager/archetypes/scripts/bash-template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template index 77ee99b30..ae1d38ba7 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template @@ -84,9 +84,9 @@ process_args () { -java-home) require_arg path "$1" "$2" && jre=`eval echo $2` && java_cmd="$jre/bin/java" && shift 2 ;; - -D*|-agentlib*|-XX*) addJava "$1" && shift ;; - -J*) addJava "${1:2}" && shift ;; - *) addResidual "$1" && shift ;; + -D*|-agentlib*|-agentpath*|-javaagent*|-XX*) addJava "$1" && shift ;; + -J*) addJava "${1:2}" && shift ;; + *) addResidual "$1" && shift ;; esac done diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template index 62da36929..5fa95c583 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template @@ -200,9 +200,9 @@ process_args () { -java-home) require_arg path "$1" "$2" && jre=`eval echo $2` && java_cmd="$jre/bin/java" && shift 2 ;; - -D*|-agentlib*|-XX*) addJava "$1" && shift ;; - -J*) addJava "${1:2}" && shift ;; - *) addResidual "$1" && shift ;; + -D*|-agentlib*|-agentpath*|-javaagent*|-XX*) addJava "$1" && shift ;; + -J*) addJava "${1:2}" && shift ;; + *) addResidual "$1" && shift ;; esac done