Index: bin/sbt
--- bin/sbt.orig
+++ bin/sbt
@@ -12,7 +12,7 @@ declare -a print_sbt_version
 declare -a print_sbt_script_version
 declare -a shutdownall
 declare -a original_args
-declare java_cmd=java
+declare java_cmd=${JAVA_HOME:-$(javaPathHelper -h sbt)}/bin/java
 declare java_version
 declare init_sbt_version=1.10.11
 declare sbt_default_mem=1024
@@ -581,7 +581,7 @@ run() {
 declare -ra noshare_opts=(-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy)
 declare -r sbt_opts_file=".sbtopts"
 declare -r build_props_file="$(pwd)/project/build.properties"
-declare -r etc_sbt_opts_file="/etc/sbt/sbtopts"
+declare -r etc_sbt_opts_file="${SYSCONFDIR}/sbt/sbtopts"
 # this allows /etc/sbt/sbtopts location to be changed
 declare machine_sbt_opts_file="${etc_sbt_opts_file}"
 declare config_home="${XDG_CONFIG_HOME:-$HOME/.config}/sbt"
