From 620d8a1929c5799d4a254b080778faa47485b65c Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Sat, 21 Mar 2026 13:59:29 +0100 Subject: [PATCH] Check if local go is already installed --- kobopatch-wasm/setup.sh | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/kobopatch-wasm/setup.sh b/kobopatch-wasm/setup.sh index 7c9f679..6ef0089 100755 --- a/kobopatch-wasm/setup.sh +++ b/kobopatch-wasm/setup.sh @@ -6,30 +6,33 @@ KOBOPATCH_DIR="$SCRIPT_DIR/kobopatch-src" GO_VERSION="1.23.12" LOCAL_GO_DIR="$SCRIPT_DIR/go" -# Detect platform and architecture -OS="$(uname -s | tr '[:upper:]' '[:lower:]')" -ARCH="$(uname -m)" -case "$ARCH" in - x86_64) ARCH="amd64" ;; - aarch64|arm64) ARCH="arm64" ;; - *) - echo "Error: unsupported architecture: $ARCH" - exit 1 - ;; -esac - -# Download Go locally if not already present or wrong version -if [ -x "$LOCAL_GO_DIR/bin/go" ] && "$LOCAL_GO_DIR/bin/go" version 2>/dev/null | grep -q "go${GO_VERSION}"; then - echo "Local Go ${GO_VERSION} already installed." +# Use system Go if available, otherwise download locally +if command -v go &>/dev/null; then + echo "Using system Go: $(go version)" +elif [ -x "$LOCAL_GO_DIR/bin/go" ] && "$LOCAL_GO_DIR/bin/go" version 2>/dev/null | grep -q "go${GO_VERSION}"; then + echo "Using local Go ${GO_VERSION}." + export GOROOT="$LOCAL_GO_DIR" + export PATH="$LOCAL_GO_DIR/bin:$PATH" else + # Detect platform and architecture + OS="$(uname -s | tr '[:upper:]' '[:lower:]')" + ARCH="$(uname -m)" + case "$ARCH" in + x86_64) ARCH="amd64" ;; + aarch64|arm64) ARCH="arm64" ;; + *) + echo "Error: unsupported architecture: $ARCH" + exit 1 + ;; + esac + echo "Downloading Go ${GO_VERSION} for ${OS}/${ARCH}..." rm -rf "$LOCAL_GO_DIR" curl -fsSL "https://go.dev/dl/go${GO_VERSION}.${OS}-${ARCH}.tar.gz" | tar -xz -C "$SCRIPT_DIR" + export GOROOT="$LOCAL_GO_DIR" + export PATH="$LOCAL_GO_DIR/bin:$PATH" fi -export GOROOT="$LOCAL_GO_DIR" -export PATH="$LOCAL_GO_DIR/bin:$PATH" - if [ -d "$KOBOPATCH_DIR" ]; then echo "Updating kobopatch source..." cd "$KOBOPATCH_DIR"