Merge 125c813 into f6f493c

Author: TomAFrench

.github/scripts/cargo-binstall-install.sh

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
 set -eu
 
-curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+cd $(dirname "$0")
+
+CARGO_BINSTALL_CHECK=$(./command-check.sh cargo-binstall)
+if [ $CARGO_BINSTALL_CHECK != "true" ]; then
+    curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+fi

.github/scripts/command-check.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+
+command -v $1 >/dev/null 2>&1 && echo "true" || { echo >&2 "$1 is not installed" && echo "false"; }

compiler/wasm/scripts/install_wasm-pack.sh

@@ -3,10 +3,7 @@ set -eu
 
 cd $(dirname "$0")/..
 
-# Install wasm-pack 
-CARGO_BINSTALL_CHECK=$(./scripts/command-check.sh cargo-binstall)
-if [ $CARGO_BINSTALL_CHECK != "true" ]; then
-    curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-fi
+../../.github/scripts/cargo-binstall-install.sh
 
+# Install wasm-pack 
 cargo-binstall wasm-pack@0.12.1 -y --force