From d7be43c4493b0d60927f967de0dc861efc180b0f Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 24 Apr 2021 16:27:38 -0400
Subject: [PATCH] Drop sbt-launch.jar from Linux distro

---
 .gitignore                                |  1 +
 launcher-package/build.sbt                | 27 +++++++++++++++--------
 launcher-package/citest/test.sh           | 21 +++++++++---------
 launcher-package/project/build.properties |  2 +-
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4901fa3a4..322179c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ npm-debug.log
 .metals
 .bsp/
 metals.sbt
+launcher-package/citest/freshly-baked
diff --git a/launcher-package/build.sbt b/launcher-package/build.sbt
index 4849ba6dc..45fc76b26 100755
--- a/launcher-package/build.sbt
+++ b/launcher-package/build.sbt
@@ -4,7 +4,7 @@ import com.typesafe.sbt.packager.SettingsHelper._
 import DebianConstants._
 
 lazy val sbtOfflineInstall =
-  sys.props.getOrElse("sbt.build.offline", sys.env.getOrElse("sbt.build.offline", "true")) match {
+  sys.props.getOrElse("sbt.build.offline", sys.env.getOrElse("sbt.build.offline", "false")) match {
     case "true" | "1"  => true
     case "false" | "0" => false
     case _             => false
@@ -15,6 +15,12 @@ lazy val sbtIncludeSbtn =
     case "false" | "0" => false
     case _             => false
   }
+lazy val sbtIncludeSbtLaunch =
+  sys.props.getOrElse("sbt.build.includesbtlaunch", sys.env.getOrElse("sbt.build.includesbtlaunch", "true")) match {
+    case "true" | "1"  => true
+    case "false" | "0" => false
+    case _             => false
+  }
 lazy val sbtVersionToRelease = sys.props.getOrElse("sbt.build.version", sys.env.getOrElse("sbt.build.version", {
         sys.error("-Dsbt.build.version must be set")
       }))
@@ -70,7 +76,7 @@ val x86MacImageName = s"sbtn-$x86MacPlatform"
 val x86LinuxImageName = s"sbtn-$x86LinuxPlatform"
 val x86WindowsImageName = s"sbtn-$x86WindowsPlatform.exe"
 
-organization in ThisBuild := "org.scal-sbt"
+organization in ThisBuild := "org.scala-sbt"
 version in ThisBuild := "0.1.0"
 
 // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution.
@@ -279,13 +285,16 @@ val root = (project in file(".")).
         case (k, v) => (k, v)
       }
     },
-
-    mappings in Universal ++= {
-      val launchJar = sbtLaunchJar.value
-      Seq(
-        launchJar -> "bin/sbt-launch.jar"
-      ) ++ sbtnJarsMappings.value
-    },
+    mappings in Universal ++= (Def.taskDyn {
+      if (sbtIncludeSbtLaunch)
+        Def.task {
+          Seq(
+            sbtLaunchJar.value -> "bin/sbt-launch.jar"
+          )
+        }
+      else Def.task { Seq[(File, String)]() }
+    }).value,
+    mappings in Universal ++= sbtnJarsMappings.value,
     mappings in Universal ++= (Def.taskDyn {
       if (sbtOfflineInstall && sbtVersionToRelease.startsWith("1."))
         Def.task {
diff --git a/launcher-package/citest/test.sh b/launcher-package/citest/test.sh
index 3cac58991..a2773a240 100755
--- a/launcher-package/citest/test.sh
+++ b/launcher-package/citest/test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # exit when something fails
 set -e
@@ -10,8 +10,9 @@ unset SBT_OPTS
 java -version
 ## end of Java switching
 
+rm -rf freshly-baked
 mkdir -p freshly-baked
-unzip -qo ../target/universal/sbt.zip -d ./freshly-baked
+unzip ../target/universal/sbt.zip -d ./freshly-baked
 
 ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about
 ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about 1> output.txt 2> err.txt
@@ -26,14 +27,14 @@ fail() {
     exit 1
 }
 
-env HOME=./target/home1 ./freshly-baked/sbt/bin/sbt about
-test -d ./target/home1/.sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home1/.sbt"
+# env HOME=./target/home1 ./freshly-baked/sbt/bin/sbt about
+# test -d ./target/home1/.sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home1/.sbt"
 
-env HOME=./target/home2 ./freshly-baked/sbt/bin/sbt -sbt-dir ./target/home2/alternate-sbt about
-test -d ./target/home2/alternate-sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home2/alternate-sbt"
+# env HOME=./target/home2 ./freshly-baked/sbt/bin/sbt -sbt-dir ./target/home2/alternate-sbt about
+# test -d ./target/home2/alternate-sbt/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home2/alternate-sbt"
 
-env HOME=./target/home3 ./freshly-baked/sbt/bin/sbt -J-Dsbt.preloaded=./target/home3/alternate-preloaded about
-test -d ./target/home3/alternate-preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home3/alternate-preloaded"
+# env HOME=./target/home3 ./freshly-baked/sbt/bin/sbt -J-Dsbt.preloaded=./target/home3/alternate-preloaded about
+# test -d ./target/home3/alternate-preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home3/alternate-preloaded"
 
-env HOME=./target/home4 ./freshly-baked/sbt/bin/sbt -J-Dsbt.global.base=./target/home4/global-base about
-test -d ./target/home4/global-base/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home4/global-base"
+# env HOME=./target/home4 ./freshly-baked/sbt/bin/sbt -J-Dsbt.global.base=./target/home4/global-base about
+# test -d ./target/home4/global-base/preloaded/org/scala-sbt || fail "expected to find preloaded in ./target/home4/global-base"
diff --git a/launcher-package/project/build.properties b/launcher-package/project/build.properties
index 133a8f197..8e682c526 100644
--- a/launcher-package/project/build.properties
+++ b/launcher-package/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=0.13.18