Merge pull request #766 from dhoepelman/ash-plugin-arguments

AshScriptPlugin - Restore argument behavior as it was before a037519
sbt · Apr 6, 2016 · 576add2 · 576add2
2 parents 66dd482 + ea97daf
commit 576add2
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/ash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/ash-template
@@ -39,9 +39,8 @@ lib_dir="$(realpath "${app_home}/../lib")"
 
 ${{template_declares}}
 
-# if configuration files exist, prepend their contents to $@ so it can be processed by this runner
-[ -f "$script_conf_file" ] && set -- $(loadConfigFile "$script_conf_file") "$@"
-
-java -classpath $app_classpath "$@" $app_mainclass
+# If a configuration file exist, read the contents to $opts
+[ -f "$script_conf_file" ] && set -- $(loadConfigFile "$script_conf_file") "$opts"
 
+java -classpath $app_classpath $opts $app_mainclass $@