VirtusLab · alexarchambault · Mar 11, 2022 · Mar 4, 2022 · Mar 4, 2022 · Mar 9, 2022
diff --git a/modules/cli/src/main/scala/scala/cli/commands/About.scala b/modules/cli/src/main/scala/scala/cli/commands/About.scala
@@ -15,5 +15,6 @@ class About(isSipScala: Boolean) extends ScalaCommand[AboutOptions] {
       if (isSipScala) "Scala command"
       else "Scala CLI"
     println(s"$appName version $version" + detailedVersionOpt.fold("")(" (" + _ + ")"))
+    if (Version.isOutdated(None)) println(Update.updateInstructions)
   }
 }
diff --git a/modules/cli/src/main/scala/scala/cli/commands/CommandUtils.scala b/modules/cli/src/main/scala/scala/cli/commands/CommandUtils.scala
@@ -1,5 +1,11 @@
 package scala.cli.commands
 
+import java.io.File
+import java.nio.file.Paths
+
+import scala.build.Os
+import scala.util.Try
+
 object CommandUtils {
 
   def isOutOfDateVersion(newVersion: String, oldVersion: String): Boolean = {
@@ -8,5 +14,26 @@ object CommandUtils {
     Version(newVersion) > Version(oldVersion)
   }
 
+  // Ensure the path to the CLI is absolute
+  def getAbsolutePathToScalaCli(programName: String): String =
+    if (programName.contains(File.separator))
+      os.Path(programName, Os.pwd).toString
+    else
+      /*
+  In order to get absolute path we first try to get it from coursier.mainJar (this works for standalone launcher)
+  If this fails we fallback to getting it from this class and finally we may also use rawArg if there is nothing left
+       */
+      sys.props.get("coursier.mainJar")
+        .map(Paths.get(_).toAbsolutePath.toString)
+        .orElse {
+          Try(
+            // This is weird but on windows we get /D:\a\scala-cli...
+            Paths.get(getClass.getProtectionDomain.getCodeSource.getLocation.toURI)
+              .toAbsolutePath
+              .toString
+          ).toOption
+        }
+        .getOrElse(programName)
+
   lazy val shouldCheckUpdate: Boolean = scala.util.Random.nextInt() % 10 == 1
 }
diff --git a/modules/cli/src/main/scala/scala/cli/commands/SetupIde.scala b/modules/cli/src/main/scala/scala/cli/commands/SetupIde.scala
@@ -5,20 +5,17 @@ import ch.epfl.scala.bsp4j.BspConnectionDetails
 import com.google.gson.GsonBuilder
 import upickle.default._
 
-import java.io.File
 import java.nio.charset.Charset
-import java.nio.file.Paths
 
 import scala.build.EitherCps.{either, value}
 import scala.build.Inputs.WorkspaceOrigin
 import scala.build.errors.{BuildException, WorkspaceError}
 import scala.build.internal.{Constants, CustomCodeWrapper}
 import scala.build.options.{BuildOptions, Scope}
-import scala.build.{Artifacts, CrossSources, Inputs, Logger, Os, Sources}
+import scala.build.{Artifacts, CrossSources, Inputs, Logger, Sources}
 import scala.cli.CurrentParams
 import scala.cli.errors.FoundVirtualInputsError
 import scala.jdk.CollectionConverters._
-import scala.util.Try
 
 object SetupIde extends ScalaCommand[SetupIdeOptions] {
 
@@ -98,27 +95,6 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
     val scalaCliBspJsonDestination =
       inputs.workspace / Constants.workspaceDirName / "ide-options.json"
 
-    // Ensure the path to the CLI is absolute
-    val absolutePathToScalaCli: String =
-      if (progName.contains(File.separator))
-        os.Path(progName, Os.pwd).toString
-      else
-        /*
-          In order to get absolute path we first try to get it from coursier.mainJar (this works for standalone launcher)
-          If this fails we fallback to getting it from this class and finally we may also use rawArg if there is nothing left
-         */
-        sys.props.get("coursier.mainJar")
-          .map(Paths.get(_).toAbsolutePath.toString)
-          .orElse {
-            Try(
-              // This is weird but on windows we get /D:\a\scala-cli...
-              Paths.get(getClass.getProtectionDomain.getCodeSource.getLocation.toURI)
-                .toAbsolutePath
-                .toString
-            ).toOption
-          }
-          .getOrElse(progName)
-
     val inputArgs = inputs.elements.collect {
       case d: Inputs.>
         val path = d.path
@@ -128,7 +104,7 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
     }
 
     val bspArgs =
-      List(absolutePathToScalaCli, "bsp") ++
+      List(CommandUtils.getAbsolutePathToScalaCli(progName), "bsp") ++
         List("--json-options", scalaCliBspJsonDestination.toString) ++
         inputArgs
     val details = new BspConnectionDetails(

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Update.scala b/modules/cli/src/main/scala/scala/cli/commands/Update.scala
@@ -4,6 +4,7 @@ import caseapp._
 
 import scala.build.Logger
 import scala.cli.CurrentParams
+import scala.cli.commands.Version.{getCurrentVersion, newestScalaCliVersion}
 import scala.cli.internal.ProcUtil
 import scala.io.StdIn.readLine
 import scala.util.{Failure, Properties, Success, Try}
@@ -50,23 +51,13 @@ object Update extends ScalaCommand[UpdateOptions] {
     }
   }
 
-  def update(options: UpdateOptions, scalaCliBinPath: os.Path) = {
-    val currentVersion = {
-      val res = os.proc(scalaCliBinPath, "version").call(cwd = os.pwd, check = false)
-      if (res.exitCode == 0)
-        res.out.text().trim
-      else
-        "0.0.0"
-    }
+  lazy val updateInstructions: String =
+    s"""Your Scala CLI version is outdated. The newest version is $newestScalaCliVersion
+       |It is recommended that you update Scala CLI through the same tool or method you used for its initial installation for avoiding the creation of outdated duplicates.""".stripMargin
 
-    lazy val newestScalaCliVersion = {
-      val resp = ProcUtil.downloadFile("https://github.com/VirtusLab/scala-cli/releases/latest")
+  def update(options: UpdateOptions, maybeScalaCliBinPath: Option[os.Path]): Unit = {
 
-      val scalaCliVersionRegex = "tag/v(.*?)\"".r
-      scalaCliVersionRegex.findFirstMatchIn(resp).map(_.group(1))
-    }.getOrElse(
-      sys.error("Can not resolve ScalaCLI version to update")
-    )
+    val currentVersion = getCurrentVersion(maybeScalaCliBinPath)
 
     val isOutdated = CommandUtils.isOutOfDateVersion(newestScalaCliVersion, currentVersion)
 
@@ -85,13 +76,14 @@ object Update extends ScalaCommand[UpdateOptions] {
 
     val scalaCliBinPath = options.installDirPath / options.binaryName
 
-    lazy val execScalaCliPath = os.proc("which", "scala-cli").call(
-      cwd = os.pwd,
-      mergeErrIntoOut = true,
-      check = false
-    ).out.text().trim
+    val programName = argvOpt.flatMap(_.headOption).getOrElse {
+      sys.error("update called in a non-standard way :|")
+    }
+
     lazy val isScalaCliInPath = // if binDir is non empty, we not except scala-cli in PATH, it is useful in tests
-      execScalaCliPath.contains(options.installDirPath.toString()) || options.binDir.isDefined
+      CommandUtils.getAbsolutePathToScalaCli(programName).contains(
+        options.installDirPath.toString()
+      ) || options.binDir.isDefined
 
     if (!os.exists(scalaCliBinPath) || !isScalaCliInPath) {
       if (!options.isInternalRun) {
@@ -107,7 +99,9 @@ object Update extends ScalaCommand[UpdateOptions] {
         sys.exit(1)
       }
     }
-    else update(options, scalaCliBinPath)
+    else if (options.binaryName == "scala-cli") update(options, None)
+    else
+      update(options, Some(scalaCliBinPath))
   }
 
   def run(options: UpdateOptions, args: RemainingArgs): Unit = {

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Version.scala b/modules/cli/src/main/scala/scala/cli/commands/Version.scala
@@ -4,11 +4,39 @@ import caseapp._
 
 import scala.build.internal.Constants
 import scala.cli.CurrentParams
+import scala.cli.internal.ProcUtil
 
 object Version extends ScalaCommand[VersionOptions] {
   override def group = "Miscellaneous"
   def run(options: VersionOptions, args: RemainingArgs): Unit = {
     CurrentParams.verbosity = options.verbosity.verbosity
     println(Constants.version)
   }
+
+  lazy val newestScalaCliVersion = {
+    val scalaCliVersionRegex = "tag/v(.*?)\"".r
+
+    val resp = ProcUtil.downloadFile("https://github.com/VirtusLab/scala-cli/releases/latest")
+
+    scalaCliVersionRegex.findFirstMatchIn(resp).map(_.group(1))
+  }.getOrElse(
+    sys.error("Can not resolve ScalaCLI version to update")
+  )
+
+  def isOutdated(maybeScalaCliBinPath: Option[os.Path]): Boolean =
+    CommandUtils.isOutOfDateVersion(newestScalaCliVersion, getCurrentVersion(maybeScalaCliBinPath))
+
+  def getCurrentVersion(maybeScalaCliBinPath: Option[os.Path]): String = {
+    val maybeCurrentVersion = maybeScalaCliBinPath.map {
+      scalaCliBinPath =>
+        val res = os.proc(scalaCliBinPath, "version").call(cwd = os.pwd, check = false)
+        if (res.exitCode == 0)
+          res.out.text().trim
+        else
+          "0.0.0"
+    }
+    maybeCurrentVersion.getOrElse(Constants.version)
+
+  }
+
 }