Cleanup.

wetware · Oct 15, 2024 · c3a4d80 · c3a4d80
1 parent be9c98e
commit c3a4d80
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 27 deletions.
diff --git a/cmd/internal/run/run.go b/cmd/internal/run/run.go
@@ -79,12 +79,15 @@ func run() cli.ActionFunc {
 		}
 		defer d.Close()
 
+		// fetches <path> for `ww run <path>`
+		bootloader := unixFSNode{
+			Name: c.Args().First(),
+			Unix: ipfs.Unixfs()}
+
 		return ww.Env{
 			IPFS: ipfs,
 			Host: h,
-			Boot: unixFSNode{
-				Name: c.Args().Get(1),
-				Unix: ipfs.Unixfs()},
+			Boot: bootloader,
 			WASM: wazero.NewRuntimeConfig().
 				WithDebugInfoEnabled(c.Bool("debug")).
 				WithCloseOnContextDone(true),

diff --git a/examples/hello-world/main.go → examples/echo/main.go b/examples/hello-world/main.go → examples/echo/main.go
@@ -3,9 +3,10 @@
 package main
 
 import (
+	"io"
 	"os"
 )
 
 func main() {
-	os.Exit(0)
+	io.Copy(os.Stdout, os.Stdin)
 }
diff --git a/examples/echo/main.wasm b/examples/echo/main.wasm
diff --git a/examples/hello-world/main.wasm b/examples/hello-world/main.wasm
diff --git a/testdata/main.go b/testdata/main.go
diff --git a/testdata/main.wasm b/testdata/main.wasm
diff --git a/ww_test.go b/ww_test.go
@@ -14,7 +14,7 @@ import (
 	ww "github.com/wetware/go"
 )
 
-//go:embed testdata/main.wasm
+//go:embed examples/echo/main.wasm
 var fileContent []byte
 
 func TestEcho(t *testing.T) {
@@ -42,12 +42,12 @@ func TestEcho(t *testing.T) {
 			// WithDebugInfoEnabled(true).
 			WithCloseOnContextDone(true),
 		Module: wazero.NewModuleConfig().
-			WithArgs("/testdata/main.wasm").
+			WithArgs("/examples/echo/main.wasm").
 			WithStdin(stdin).
 			WithStdout(stdout).
 			WithStderr(stderr).
 			WithFSConfig(wazero.NewFSConfig().
-				WithDirMount("testdata", "/testdata/")),
+				WithDirMount("examples/echo", "/examples/echo/")),
 	}.Serve(ctx)
 
 	require.NoError(t, err, "server failed")