From 9d42538f66733558851c737ec33cb03f1a760280 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Thu, 17 Jun 2021 11:01:48 +0200 Subject: [PATCH 1/2] fix(wapm) Fix the `wax` script generation. On macOS, `echo` always enables interpretation of backslach sequences (like `\n`). On Linux, the `-e` flag must be used. Even if this `-e` flag is absent from the macOS man's page for `echo(1)`, it is accepted and ignored, thus we can safely use it in our `Makefile`. To test this patch: ```sh $ # before $ make package-wapm $ cat package/bin/wax $ $ # after $ make package-wapm $ cat package/bin/wax wapm execute "$@" ``` --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 53cfee37ad2..6669a2dc5b8 100644 --- a/Makefile +++ b/Makefile @@ -542,7 +542,7 @@ package-wapm: ifneq (, $(filter 1, $(IS_DARWIN) $(IS_LINUX))) if [ -d "wapm-cli" ]; then \ cp wapm-cli/$(TARGET_DIR)/wapm package/bin/ ;\ - echo "#!/bin/bash\nwapm execute \"\$$@\"" > package/bin/wax ;\ + echo -e "#!/bin/bash\nwapm execute \"\$$@\"" > package/bin/wax ;\ chmod +x package/bin/wax ;\ fi else From 76a856d3bd8287b1400a6b63aa4584d3aa4245d6 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Thu, 17 Jun 2021 11:06:24 +0200 Subject: [PATCH 2/2] doc(changelog) Add #2426. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c390a0fb48c..d4d8d83cdff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C ## **[Unreleased]** +### Fixed +- [#2426](https://github.com/wasmerio/wasmer/pull/2426) Fix the `wax` script generation. + ## 2.0.0 - 2020/06/16 ### Added