Skip to content

Commit

Permalink
Fixes after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
lwronski committed Mar 14, 2022
1 parent 0777ff6 commit 6c07492
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ final case class SimpleScalaCompiler(
args,
logger,
cwd = Some(project.workspace)
)
).waitFor()

res == 0
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ object Package extends ScalaCommand[PackageOptions] {
args,
logger,
cwd = Some(build.inputs.workspace)
)
).waitFor()
if (retCode == 0)
libraryJar(build, hasActualManifest = false, contentDirOverride = Some(destDir))
else
Expand Down
7 changes: 4 additions & 3 deletions modules/cli/src/main/scala/scala/cli/commands/Run.scala
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,10 @@ object Run extends ScalaCommand[RunOptions] {
logger: Logger
)(f: os.Path => T): Either[BuildException, T] = {
val dest = os.temp(prefix = "main", suffix = ".js")
Package.linkJs(build, dest, mainClassOpt, addTestInitializer, config, logger).map { _ =>
f(dest)
}
try Package.linkJs(build, dest, mainClassOpt, addTestInitializer, config, logger).map { _ =>
f(dest)
}
finally if (os.exists(dest)) os.remove(dest)
}

def withNativeLauncher[T](
Expand Down
2 changes: 0 additions & 2 deletions modules/cli/src/main/scala/scala/cli/internal/ProcUtil.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ object ProcUtil {

def interruptProcess(process: Process, logger: Logger): Unit = {
val pid = process.pid()

try
if (process.isAlive) {
logger.debug(s"Sending a SIGINT signal to process PID:$pid")
Expand All @@ -66,7 +65,6 @@ object ProcUtil {
case NonFatal(e) =>
logger.debug(s"Ignoring error during interrupt process: $e")
}

}

}

0 comments on commit 6c07492

Please sign in to comment.