updated script

zig/download.sh

···
 set -e
 
 [ -z "$ZIG_VERSION" ] && ZIG_VERSION="master"
-command -v jq >/dev/null || { echo "Error: jq is required to parse Zig's download manifest"; exit 1; }
-command -v minisign >/dev/null || { echo "Error: minisign is required to verify Zig's signature"; exit 1; }
-mkdir -p zig
+[ -z "$ZIG_PUBLIC_KEY" ] && ZIG_PUBLIC_KEY="RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U"
+
+command -v jq >/dev/null || { echo "jq required"; exit 1; }
+command -v minisign >/dev/null || { echo "minisign required"; exit 1; }
+
+# Clean up previous installation
+if [ -L "zig/zig" ]; then
+  prev_dir=$(readlink zig/zig | cut -d '/' -f 2)
+  [ -d "zig/$prev_dir" ] && rm -rf "zig/$prev_dir"
+  rm -f "zig/zig"
+fi
 
 case "$(uname -s)" in
   Linux)
···
       aarch64) p="aarch64-linux" ;;
       armv7l) p="arm-linux" ;;
       i686) p="x86-linux" ;;
-      *) echo "Error: Unsupported architecture $(uname -m)"; exit 1 ;;
+      *) echo "Arch unsupported"; exit 1 ;;
     esac
     ;;
   Darwin)
     case "$(uname -m)" in
       x86_64) p="x86_64-macos" ;;
       arm64) p="aarch64-macos" ;;
-      *) echo "Error: Unsupported architecture $(uname -m)"; exit 1 ;;
+      *) echo "Arch unsupported"; exit 1 ;;
     esac
     ;;
-  *) echo "Error: Unsupported OS $(uname -s)"; exit 1 ;;
+  *) echo "OS unsupported"; exit 1 ;;
 esac
 
 u=$(curl -s https://ziglang.org/download/index.json | jq -r ".\"$ZIG_VERSION\".\"$p\".tarball")
-[ -z "$u" ] && { echo "Error: Could not find download URL for version $ZIG_VERSION on $p"; exit 1; }
+[ -z "$u" ] && { echo "Version not found"; exit 1; }
 
 f=$(basename "$u")
-echo "Downloading $u to zig/$f..."
-curl -L "$u" -o "zig/$f" || { echo "Error: Failed to download Zig compiler"; exit 1; }
-curl -L "$u.minisig" -o "zig/$f.minisig" || { echo "Error: Failed to download minisig signature"; exit 1; }
-echo "RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U" > zig/zig.pub
-echo "Verifying signature..."
-minisign -Vm "zig/$f" -P zig/zig.pub || { echo "Error: Signature verification failed - this is critical for security"; exit 1; }
+curl -sfL "$u" -o "zig/$f" || { echo "Download failed"; exit 1; }
+curl -sfL "$u.minisig" -o "zig/$f.minisig" || { echo "Sig download failed"; exit 1; }
+minisign -Vm "zig/$f" -P "$ZIG_PUBLIC_KEY" || { echo "Sig verification failed"; exit 1; }
 
-# Create temporary extraction directory
-mkdir -p zig/extract
-
-# Extract to temporary location with --no-same-owner for CI environments
+# Extract directly to zig folder
 if [[ "$f" == *.zip ]]; then
-  echo "Extracting ZIP archive..."
-  unzip -q "zig/$f" -d zig/extract
+  unzip -q "zig/$f" -d zig
 else
-  echo "Extracting TAR archive with --no-same-owner (fixes CI permission issues)..."
-  tar -xJf "zig/$f" --no-same-owner -C zig/extract
+  tar -xJf "zig/$f" --no-same-owner -C zig
 fi
 
-# Find the first directory at the top level (should be the Zig directory)
-d=$(find "zig/extract" -mindepth 1 -maxdepth 1 -type d -print -quit)
-if [ -z "$d" ]; then
-  echo "Error: Could not determine extracted directory structure"
-  echo "Contents of extract directory:"
-  ls -la zig/extract
-  exit 1
-fi
-d=$(basename "$d")
+# Derive directory name
+d=$(echo "$f" | sed -E 's/\.(tar\.xz|tar\.gz|zip|tgz|tar)$//')
 
-echo "Found Zig directory: $d"
+# Verify binary exists
+[ ! -f "zig/$d/zig" ] && { echo "Binary not found"; exit 1; }
 
-# Verify the binary exists before creating symlink
-if [ ! -f "zig/extract/$d/bin/zig" ]; then
-  echo "Error: Zig binary not found at expected location: zig/extract/$d/bin/zig"
-  echo "Available files:"
-  find "zig/extract" -type f
-  exit 1
-fi
-
-# Create symlink with verification
-ln -sfv "zig/extract/$d/bin/zig" zig/zig || { echo "Error: Failed to create symlink"; exit 1; }
+# Create symlink with absolute paths
+ln -sf "$(pwd)/zig/$d/zig" "$(pwd)/zig/zig"
 
 # Cleanup
-rm -f "zig/$f" "zig/$f.minisig" zig/zig.pub
-rm -rf "zig/extract"
+rm -f "zig/$f" "zig/$f.minisig"
 
-echo "Zig compiler installed successfully!"
-echo "Run with: ./zig/zig --version"
+echo "Zig installed successfully"