Skip to content

Commit e99a75d

Browse files
committed
fix sbt#766
1 parent cee091c commit e99a75d

File tree

1 file changed

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

1 file changed

+2
-3
lines changed

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ realpath () {
2929

3030
# Loads a configuration file full of default command line options for this script.
3131
loadConfigFile() {
32-
cat "$1" | sed '/^\#/d'
32+
cat "$1" | sed '/^\#/d' | sed 's/^-J-X/-X/' | tr '\r\n' ' '
3333
}
3434

3535

@@ -40,7 +40,6 @@ lib_dir="$(realpath "${app_home}/../lib")"
4040
${{template_declares}}
4141

4242
# If a configuration file exist, read the contents to $opts
43-
[ -f "$script_conf_file" ] && set -- $(loadConfigFile "$script_conf_file") "$opts"
43+
[ -f "$script_conf_file" ] && opts=$(loadConfigFile "$script_conf_file")
4444

4545
java -classpath $app_classpath $opts $app_mainclass $@
46-

0 commit comments

Comments
 (0)