From b0dd7d0fe2c606bb3ce35cea96ae70ca65948429 Mon Sep 17 00:00:00 2001
From: Tom Tang <xmader@distributive.network>
Date: Sun, 18 Aug 2024 04:57:01 +0000
Subject: [PATCH] fix(CI): fix Windows build for finding the `cargo` executable

---
 setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.sh b/setup.sh
index ca7ab7c9..4fb71487 100755
--- a/setup.sh
+++ b/setup.sh
@@ -34,15 +34,15 @@ fi
 # Install rust compiler
 echo "Installing rust compiler"
 curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.76
-. $HOME/.cargo/env
-cargo install cbindgen
+CARGO_BIN="$HOME/.cargo/bin/cargo" # also works for Windows. On Windows this equals to %USERPROFILE%\.cargo\bin\cargo
+$CARGO_BIN install cbindgen
 # Setup Poetry
 echo "Installing poetry"
 curl -sSL https://install.python-poetry.org | python3 - --version "1.7.1"
 if [[ "$OSTYPE" == "msys"* ]]; then # Windows
   POETRY_BIN="$APPDATA/Python/Scripts/poetry"
 else
-  POETRY_BIN=`echo ~/.local/bin/poetry` # expand tilde
+  POETRY_BIN="$HOME/.local/bin/poetry"
 fi
 $POETRY_BIN self add 'poetry-dynamic-versioning[plugin]'
 echo "Done installing dependencies"