From b6069de840d5869ca24f49a6869e73f559e6de60 Mon Sep 17 00:00:00 2001 From: Daniele Torelli Date: Mon, 19 Aug 2024 16:04:14 +0200 Subject: [PATCH] Minor changes --- project/Settings.scala | 1 - .../scala/cloud/golem/WasmComponentPluginInternal.scala | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/project/Settings.scala b/project/Settings.scala index 7967fd8..e025681 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -10,7 +10,6 @@ object Settings { import xerial.sbt.Sonatype import xerial.sbt.Sonatype.SonatypeKeys.* - project.settings( inThisBuild( List( diff --git a/src/main/scala/cloud/golem/WasmComponentPluginInternal.scala b/src/main/scala/cloud/golem/WasmComponentPluginInternal.scala index 6d4c53a..7377441 100644 --- a/src/main/scala/cloud/golem/WasmComponentPluginInternal.scala +++ b/src/main/scala/cloud/golem/WasmComponentPluginInternal.scala @@ -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( @@ -46,7 +46,7 @@ private[golem] object WasmComponentPluginInternal { """.stripMargin } val output = Seq( - "bash", + "sh", "-xc", s"$bindGenCommand -w ${wasmComponentWitFullPath.value} -p ${wasmComponentPackageName.value}" ).!! @@ -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 {