luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Use `preloaded` from `-sbt-dir`" 

This reverts commit b8dbe42ece.
This commit is contained in:
Eugene Yokota 2018-10-17 01:57:08 -04:00
parent 9c19799b73
commit 1d806c9cf3
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/universal/bin/sbt
View File

@ -121,7 +121,7 @@ process_my_args () {
-no-share) addJava "$noshare_opts" && shift ;; -no-share) addJava "$noshare_opts" && shift ;;
-no-global) addJava "-Dsbt.global.base=$(pwd)/project/.sbtboot" && 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-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 ;; -debug-inc) addJava "-Dxsbt.inc.debug=true" && shift ;;
-batch) exec </dev/null && shift ;; -batch) exec </dev/null && shift ;;

18
src/universal/bin/sbt-launch-lib.bash
View File

@ -14,7 +14,6 @@ declare java_cmd=java
declare java_version declare java_version
declare init_sbt_version=_to_be_replaced declare init_sbt_version=_to_be_replaced
declare sbt_default_mem=1024 declare sbt_default_mem=1024
declare sbt_dir="$HOME/.sbt"
declare SCRIPT=$0 declare SCRIPT=$0
while [ -h "$SCRIPT" ] ; do while [ -h "$SCRIPT" ] ; do
@ -219,12 +218,12 @@ syncPreloaded() {
# FIXME: better $init_sbt_version detection # FIXME: better $init_sbt_version detection
init_sbt_version="$(ls -1 "$sbt_home/lib/local-preloaded/org.scala-sbt/sbt/")" init_sbt_version="$(ls -1 "$sbt_home/lib/local-preloaded/org.scala-sbt/sbt/")"
fi 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) # lib/local-preloaded exists (This is optional)
[[ -d "$sbt_home/lib/local-preloaded/" ]] && { [[ -d "$sbt_home/lib/local-preloaded/" ]] && {
command -v rsync >/dev/null 2>&1 && { command -v rsync >/dev/null 2>&1 && {
mkdir -p "$sbt_dir/preloaded" mkdir -p "$HOME/.sbt/preloaded"
rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$sbt_dir/preloaded" rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$HOME/.sbt/preloaded"
} }
} }
} }
@ -278,12 +277,6 @@ copyRt() {
} }
run() { 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 syncPreloaded
# no jar? download it. # no jar? download it.
@ -293,6 +286,11 @@ run() {
exit 1 exit 1
} }
# process the combined args, then reset "$@" to the residuals
process_args "$@"
set -- "${residual_args[@]}"
argumentCount=$#
# TODO - java check should be configurable... # TODO - java check should be configurable...
checkJava "6" checkJava "6"