From 0f8b3b0ffb29dfb035bc3422b79cfef004ac3b9a Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 7 Apr 2017 04:13:13 -0400 Subject: [PATCH] Fix bash script --- build.sbt | 4 ++-- src/universal/bin/sbt-launch-lib.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 312a90dc3..b2946b37c 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import _root_.bintray.{BintrayRepo, Bintray} import NativePackagerHelper._ lazy val sbtOfflineInstall = - sys.props.getOrElse("sbt.build.offline", sys.env.getOrElse("sbt.build.offline", "false")) match { + sys.props.getOrElse("sbt.build.offline", sys.env.getOrElse("sbt.build.offline", "true")) match { case "true" => true case "1" => true case _ => false @@ -182,7 +182,7 @@ def makePublishToForConfig(config: Configuration) = { inConfig(config)(Seq( bintrayOrganization := { // offline installation exceeds 50MB file limit for OSS organization - if (sbtOfflineInstall) Some("lightbend") + if (sbtOfflineInstall) Some("sbt") else Some("sbt") }, bintrayRepository := bintrayTripple.value._1, diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash index 7ef516bae..cb7a66a46 100755 --- a/src/universal/bin/sbt-launch-lib.bash +++ b/src/universal/bin/sbt-launch-lib.bash @@ -160,7 +160,7 @@ process_args () { syncPreloaded() { [[ -f "$HOME/.sbt/preloaded/org.scala-sbt/sbt/$init_sbt_version/jars/sbt.jar" ]] || { # lib/local-preloaded exists (This is optional) - [[ -f "$sbt_home/lib/local-preloaded/" ]] && { + [[ -d "$sbt_home/lib/local-preloaded/" ]] && { command -v rsync >/dev/null 2>&1 && { mkdir -p "$HOME/.sbt/preloaded" rsync -a --ignore-existing "$sbt_home/lib/local-preloaded/" "$HOME/.sbt/preloaded"