[WASM] Improve dependency install script

Author: kateinoigakukun

utils/webassembly/install-wasi-sdk.sh

@@ -1,18 +1,23 @@
 #!/bin/bash
 
-set -ex
+set -eux
 
 SOURCE_PATH="$( cd "$(dirname "$0")/../../../" && pwd  )"
 
 cd "$SOURCE_PATH"
 
 WASI_SDK_URL="https://github.com/swiftwasm/wasi-sdk/releases/download/0.2.2-swiftwasm/dist-$2.zip"
 
-[ ! -e dist-wasi-sdk.zip ] && \
-  wget -O dist-wasi-sdk.zip "$WASI_SDK_URL"
+workdir=$(mktemp -d)
+pushd $workdir
+
+wget -O dist-wasi-sdk.zip "$WASI_SDK_URL"
 unzip -u dist-wasi-sdk.zip -d .
-WASI_SDK_TAR_PATH=$(find . -type f -name "wasi-sdk-*")
+
+WASI_SDK_TAR_PATH=$(find "$workdir" -type f -name "wasi-sdk-*")
 WASI_SDK_FULL_NAME=$(basename "$WASI_SDK_TAR_PATH" -"$1".tar.gz)
 tar xfz "$WASI_SDK_TAR_PATH"
-rm -rf ./wasi-sdk
-mv "$WASI_SDK_FULL_NAME" ./wasi-sdk
+popd
+
+rm -rf $SOURCE_PATH/wasi-sdk
+mv "$workdir/$WASI_SDK_FULL_NAME" $SOURCE_PATH/wasi-sdk

utils/webassembly/macos/install-dependencies.sh

@@ -2,10 +2,12 @@
 
 set -ex
 
-brew uninstall $(brew list | grep python@2)
-brew install cmake ninja llvm sccache wasmer
+if [[ ! -z "$CI" ]]; then
+  brew uninstall $(brew list | grep python@2)
+  brew install cmake ninja llvm sccache wasmer
+fi
 
-SOURCE_PATH="$( cd "$(dirname $0)/../../../../" && pwd  )"
+SOURCE_PATH="$(cd "$(dirname $0)/../../../../" && pwd)"
 SWIFT_PATH=$SOURCE_PATH/swift
 cd $SWIFT_PATH