Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
danieletorelli committed Aug 19, 2024
1 parent efcec3d commit b6069de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion project/Settings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ object Settings {
import xerial.sbt.Sonatype
import xerial.sbt.Sonatype.SonatypeKeys.*


project.settings(
inThisBuild(
List(
Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/cloud/golem/WasmComponentPluginInternal.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ private[golem] object WasmComponentPluginInternal {
)
def checkCommandOrFail(command: String)(error: => String): Unit = {
import scala.sys.process.*
val commandExists = Seq("bash", "-xc", s"which $command").! == 0
val commandExists = Seq("sh", "-xc", s"which $command").! == 0
if (!commandExists) sys.error(error)
}
Def.settings(
Expand Down Expand Up @@ -46,7 +46,7 @@ private[golem] object WasmComponentPluginInternal {
""".stripMargin
}
val output = Seq(
"bash",
"sh",
"-xc",
s"$bindGenCommand -w ${wasmComponentWitFullPath.value} -p ${wasmComponentPackageName.value}"
).!!
Expand All @@ -66,8 +66,8 @@ private[golem] object WasmComponentPluginInternal {
""".stripMargin
}

Seq("bash", "-xc", s"$npmCommand install").!!
Seq("bash", "-xc", s"$npmCommand run build").!!
Seq("sh", "-xc", s"$npmCommand install").!!
Seq("sh", "-xc", s"$npmCommand run build").!!
},
wasmComponent := (wasmComponent dependsOn (Compile / fullLinkJS)).value,
Compile / sourceGenerators += Def.taskIf {
Expand Down

0 comments on commit b6069de

Please sign in to comment.