Merge pull request #1866 from lwronski/fix-main

Run generate reference doc as non sip

Author: lwronski

build.sc

@@ -156,6 +156,10 @@ object `generate-reference-doc` extends SbtModule with ScalaCliScalafixModule {
     Deps.munit
   )
   def mainClass = Some("scala.cli.doc.GenerateReferenceDoc")
+
+  def forkEnv = super.forkEnv() ++ Seq(
+    "SCALA_CLI_POWER" -> "true"
+  )
 }
 
 object dummy extends Module {

modules/cli/src/main/scala/scala/cli/ScalaCli.scala

@@ -35,13 +35,14 @@ object ScalaCli {
   }
   private val scalaCliBinaryName = "scala-cli"
   private var isSipScala = {
-    val isSipScala = for {
+    lazy val isPowerConfigDb = for {
       configDb   <- ConfigDb.open(Directories.directories.dbPath.toNIO).toOption
       powerEntry <- configDb.get(Keys.power).toOption
       power      <- powerEntry
-    } yield !power
-
-    isSipScala.getOrElse(true)
+    } yield power
+    val isPowerEnv = Option(System.getenv("SCALA_CLI_POWER")).flatMap(_.toBooleanOption)
+    val isPower    = isPowerEnv.orElse(isPowerConfigDb).getOrElse(false)
+    !isPower
   }
   def allowRestrictedFeatures = !isSipScala
   def fullRunnerName =

modules/cli/src/main/scala/scala/cli/commands/github/SecretCreateOptions.scala

@@ -9,7 +9,7 @@ import scala.cli.commands.tags
 // format: off
 @HelpMessage(
   s"""Creates or updates a GitHub repository secret.
-    |  $progName ${HelpMessages.PowerString}github secret create --repo repo-org/repo-name SECRET_VALUE=value:secret
+    |  $progName --power github secret create --repo repo-org/repo-name SECRET_VALUE=value:secret
     |""".stripMargin)
 final case class SecretCreateOptions(
   @Recurse

modules/cli/src/main/scala/scala/cli/commands/publish/PublishOptions.scala

@@ -13,7 +13,7 @@ import scala.cli.commands.shared.*
      |We recommend running the `publish setup` sub-command once prior to
      |running `publish` in order to set missing `using` directives for publishing.
      |(but this is not mandatory)
-     |    $baseRunnerName ${HelpMessages.PowerString}publish setup .
+     |    $baseRunnerName --power publish setup .
      |
      |${HelpMessages.commandConfigurations("publish")}
      |

modules/cli/src/main/scala/scala/cli/commands/uninstall/Uninstall.scala

@@ -49,7 +49,7 @@ object Uninstall extends ScalaCommand[UninstallOptions] {
       )
       // exit bloop server
       logger.debug("Stopping Bloop server...")
-      BloopExit.run(options.bloopExit, args)
+      BloopExit.runCommand(options.bloopExit, args, options.logging.logger)
       // remove scala-cli launcher
       logger.debug(s"Removing $baseRunnerName binary...")
       os.remove.all(binDirPath)