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

Fix bash script

This commit is contained in:
Eugene Yokota 2017-04-07 04:13:13 -04:00
parent 7ac685831c
commit 0f8b3b0ffb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -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,

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

@ -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"