Skip to content

Commit fe7387a

Browse files
committed
Merge pull request #95 from hackmann/master
Do not declare java_cmd read-only as process_args will override it
2 parents 7db7904 + 40b2182 commit fe7387a

File tree

1 file changed

+2
-1
lines changed
  • src/main/resources/com/typesafe/sbt/packager/archetypes

1 file changed

+2
-1
lines changed

src/main/resources/com/typesafe/sbt/packager/archetypes/bash-template

+2-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,8 @@ declare -r app_home="$(realpath "$(dirname "$real_script_path")")"
301301
# TODO - Check whether this is ok in cygwin...
302302
declare -r lib_dir="$(realpath "${app_home}/../lib")"
303303
${{template_declares}}
304-
declare -r java_cmd=$(get_java_cmd)
304+
# java_cmd is overrode in process_args when -java-home is used
305+
declare java_cmd=$(get_java_cmd)
305306

306307
# Now check to see if it's a good enough version
307308
# TODO - Check to see if we have a configured default java version, otherwise use 1.6

0 commit comments

Comments
 (0)