-agentpath/-javaagent options should be treated as Java options like …

…-agentlib (#1510)
sbt · Aug 13, 2022 · bcac648 · bcac648
1 parent 7cca9b1
commit bcac648
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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