From 9c19799b73c297b88d4ea626e0c44430ddcb4be2 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 17 Oct 2018 01:56:57 -0400
Subject: [PATCH 1/2] Revert "Improve logic for finding preloaded directory"

This reverts commit c8219f8396143161b24d3eafe44fd24d2d025567.
---
 src/universal/bin/sbt                 |  2 +-
 src/universal/bin/sbt-launch-lib.bash | 50 ++++-----------------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt
index cca77be05..e1882460f 100755
--- a/src/universal/bin/sbt
+++ b/src/universal/bin/sbt
@@ -121,7 +121,7 @@ process_my_args () {
       -no-share) addJava "$noshare_opts" && shift ;;
      -no-global) addJava "-Dsbt.global.base=$(pwd)/project/.sbtboot" && shift ;;
       -sbt-boot) require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;;
-       -sbt-dir) require_arg path "$1" "$2" && addJava "-Dsbt.global.base=$2" && shift 2 ;;
+       -sbt-dir) require_arg path "$1" "$2" && addJava "-Dsbt.global.base=$2" && sbt_dir="$2" && shift 2 ;;
      -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;;
          -batch) exec </dev/null && shift ;;
 
diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash
index c93245dc1..ad2daeb84 100755
--- a/src/universal/bin/sbt-launch-lib.bash
+++ b/src/universal/bin/sbt-launch-lib.bash
@@ -14,6 +14,7 @@ declare java_cmd=java
 declare java_version
 declare init_sbt_version=_to_be_replaced
 declare sbt_default_mem=1024
+declare sbt_dir="$HOME/.sbt"
 
 declare SCRIPT=$0
 while [ -h "$SCRIPT" ] ; do
@@ -213,54 +214,17 @@ process_args () {
   vlog "[process_args] java_version = '$java_version'"
 }
 
-# Extracts the preloaded directory from either -Dsbt.preloaded or -Dsbt.global.base
-# properties by looking at:
-#   - _JAVA_OPTIONS environment variable,
-#   - SBT_OPTS environment variable,
-#   - JAVA_OPTS environment variable and
-#   - properties set by command-line options
-# in that order. The last one will be chosen such that `sbt.preloaded` is
-# always preferred over `sbt.global.base`.
-getPreloaded() {
-  local -a _java_options_array
-  local -a sbt_opts_array
-  local -a java_opts_array
-  read -a _java_options_array <<< "$_JAVA_OPTIONS"
-  read -a sbt_opts_array <<< "$SBT_OPTS"
-  read -a java_opts_array <<< "$JAVA_OPTS"
-
-  local args_to_check=(
-    "${_java_options_array[@]}"
-    "${sbt_opts_array[@]}"
-    "${java_opts_array[@]}"
-    "${java_args[@]}")
-  local via_global_base="$HOME/.sbt/preloaded"
-  local via_explicit=""
-
-  for opt in "${args_to_check[@]}"; do
-    if [[ "$opt" == -Dsbt.preloaded=* ]]; then
-      via_explicit="${opt#-Dsbt.preloaded=}"
-    elif [[ "$opt" == -Dsbt.global.base=* ]]; then
-      via_global_base="${opt#-Dsbt.global.base=}/preloaded"
-    fi
-  done
-
-  echo "${via_explicit:-${via_global_base}}"
-}
-
 syncPreloaded() {
-  local source_preloaded="$sbt_home/lib/local-preloaded"
-  local target_preloaded="$(getPreloaded)"
   if [[ "$init_sbt_version" == "" ]]; then
     # FIXME: better $init_sbt_version detection
-    init_sbt_version="$(ls -1 "$source_preloaded/org.scala-sbt/sbt/")"
+    init_sbt_version="$(ls -1 "$sbt_home/lib/local-preloaded/org.scala-sbt/sbt/")"
   fi
-  [[ -f "$target_preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || {
+  [[ -f "$sbt_dir/preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || {
     # lib/local-preloaded exists (This is optional)
-    [[ -d "$source_preloaded" ]] && {
+    [[ -d "$sbt_home/lib/local-preloaded/" ]] && {
       command -v rsync >/dev/null 2>&1 && {
-        mkdir -p "$target_preloaded"
-        rsync -a --ignore-existing "$source_preloaded" "$preloaded"
+        mkdir -p "$sbt_dir/preloaded"
+        rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$sbt_dir/preloaded"
       }
     }
   }
@@ -319,7 +283,7 @@ run() {
   set -- "${residual_args[@]}"
   argumentCount=$#
 
-  # Copy preloaded repo to user's preloaded directory
+  # Copy preloaded repo to sbt_dir (if rsync is available)
   syncPreloaded
 
   # no jar? download it.

From 1d806c9cf303ba58f6e7d7bc876586cedada2881 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 17 Oct 2018 01:57:08 -0400
Subject: [PATCH 2/2] Revert "Use `preloaded` from `-sbt-dir`"

This reverts commit b8dbe42ece35ac7064e15d5de15b2f81ce0bf818.
---
 src/universal/bin/sbt                 |  2 +-
 src/universal/bin/sbt-launch-lib.bash | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt
index e1882460f..cca77be05 100755
--- a/src/universal/bin/sbt
+++ b/src/universal/bin/sbt
@@ -121,7 +121,7 @@ process_my_args () {
       -no-share) addJava "$noshare_opts" && shift ;;
      -no-global) addJava "-Dsbt.global.base=$(pwd)/project/.sbtboot" && shift ;;
       -sbt-boot) require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;;
-       -sbt-dir) require_arg path "$1" "$2" && addJava "-Dsbt.global.base=$2" && sbt_dir="$2" && shift 2 ;;
+       -sbt-dir) require_arg path "$1" "$2" && addJava "-Dsbt.global.base=$2" && shift 2 ;;
      -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;;
          -batch) exec </dev/null && shift ;;
 
diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash
index ad2daeb84..e7155a148 100755
--- a/src/universal/bin/sbt-launch-lib.bash
+++ b/src/universal/bin/sbt-launch-lib.bash
@@ -14,7 +14,6 @@ declare java_cmd=java
 declare java_version
 declare init_sbt_version=_to_be_replaced
 declare sbt_default_mem=1024
-declare sbt_dir="$HOME/.sbt"
 
 declare SCRIPT=$0
 while [ -h "$SCRIPT" ] ; do
@@ -219,12 +218,12 @@ syncPreloaded() {
     # FIXME: better $init_sbt_version detection
     init_sbt_version="$(ls -1 "$sbt_home/lib/local-preloaded/org.scala-sbt/sbt/")"
   fi
-  [[ -f "$sbt_dir/preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || {
+  [[ -f "$HOME/.sbt/preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || {
     # lib/local-preloaded exists (This is optional)
     [[ -d "$sbt_home/lib/local-preloaded/" ]] && {
       command -v rsync >/dev/null 2>&1 && {
-        mkdir -p "$sbt_dir/preloaded"
-        rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$sbt_dir/preloaded"
+        mkdir -p "$HOME/.sbt/preloaded"
+        rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$HOME/.sbt/preloaded"
       }
     }
   }
@@ -278,12 +277,6 @@ copyRt() {
 }
 
 run() {
-  # process the combined args, then reset "$@" to the residuals
-  process_args "$@"
-  set -- "${residual_args[@]}"
-  argumentCount=$#
-
-  # Copy preloaded repo to sbt_dir (if rsync is available)
   syncPreloaded
 
   # no jar? download it.
@@ -293,6 +286,11 @@ run() {
     exit 1
   }
 
+  # process the combined args, then reset "$@" to the residuals
+  process_args "$@"
+  set -- "${residual_args[@]}"
+  argumentCount=$#
+
   # TODO - java check should be configurable...
   checkJava "6"