From afb63e66061c22e53d0518fe198ac228ed85f1e1 Mon Sep 17 00:00:00 2001 From: Lucas Horward Date: Mon, 7 Aug 2023 14:05:56 +0200 Subject: [PATCH] Fix error and warnings in install script - Fixed error on line 139 - "==" was being used, whereas sh expects a "=" (and we do this correctly throughout the rest of the file). See https://www.shellcheck.net/wiki/SC3014 for more. - Changed the use of backticks to the use of `$()` as specified in https://www.shellcheck.net/wiki/SC2006 - Changed the use of `-a` to `&&` as specified in https://www.shellcheck.net/wiki/SC2166 Closes #1159 Closes #1217 Closes #1283 --- docs/_installer/init.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_installer/init.sh b/docs/_installer/init.sh index 91ec0af..86f8322 100644 --- a/docs/_installer/init.sh +++ b/docs/_installer/init.sh @@ -42,7 +42,7 @@ main() { which rustup > /dev/null 2>&1 need_ok "failed to find Rust installation, is rustup installed?" - local _rustup=`which rustup` + local _rustup=$(which rustup) local _tardir="wasm-pack-$VERSION-${_arch}" local _url="$UPDATE_ROOT/${_tardir}.tar.gz" local _dir="$(mktemp -d 2>/dev/null || ensure mktemp -d -t wasm-pack)" @@ -98,7 +98,7 @@ get_architecture() { set -u - if [ "$_ostype" = Darwin -a "$_cputype" = i386 ]; then + if [ "$_ostype" = Darwin ] && [ "$_cputype" = i386 ]; then # Darwin `uname -s` lies if sysctl hw.optional.x86_64 | grep -q ': 1'; then local _cputype=x86_64 @@ -136,7 +136,7 @@ get_architecture() { esac # See https://github.com/rustwasm/wasm-pack/pull/1088 - if [ "$_cputype" == "aarch64" ] && [ "$_ostype" == "apple-darwin" ]; then + if [ "$_cputype" = "aarch64" ] && [ "$_ostype" = "apple-darwin" ]; then _cputype="x86_64" fi