Merge pull request #242 from lwronski/bugfix/update-standalone-launchers

Bugfix/update standalone launchers
VirtusLab · Oct 20, 2021 · aa3bddb · aa3bddb
2 parents d0a9370 + 7708398
commit aa3bddb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.sc b/build.sc
@@ -690,9 +690,9 @@ object ci extends Module {
     val standaloneLauncherPath        = scalaCliDir / "scala-cli.sh"
     val standaloneWindowsLauncherPath = scalaCliDir / "scala-cli.bat"
 
-    // clean target directory
-    if (os.exists(targetDir)) os.remove.all(targetDir)
-    os.makeDir.all(targetDir)
+    // clean scala-cli directory
+    if (os.exists(scalaCliDir)) os.remove.all(scalaCliDir)
+    if (!os.exists(targetDir)) os.makeDir.all(targetDir)
 
     val branch = "master"
     val repo   = s"https://oauth2:${ghToken()}@github.com/VirtusLab/scala-cli.git"

diff --git a/modules/tasty-lib/src/main/scala/scala/build/tastylib/TastyVersions.scala b/modules/tasty-lib/src/main/scala/scala/build/tastylib/TastyVersions.scala
@@ -16,7 +16,7 @@ object TastyVersions {
     scalaVersion: String,
     scalaCliVersion: String
   ): Either[String, Boolean] =
-    if (!scalaVersion.startsWith("3.") && scalaVersion != "3" ) Right(false)
+    if (!scalaVersion.startsWith("3.") && scalaVersion != "3") Right(false)
     else
       scalaVersion.split('.')(1).toInt match {
         case scalaMinor if scalaMinor > LatestSupportedScala.MinorVersion =>