From e21f43ba66f6106a5b22f307f5df9698ab0badf5 Mon Sep 17 00:00:00 2001
From: smheidrich <smheidrich@weltenfunktion.de>
Date: Sun, 25 Feb 2024 00:05:53 +0100
Subject: [PATCH] Check for rustup in CI (in addition to cargo)

---
 ci-utils/before-build-mac.sh | 2 +-
 ci-utils/before-build-win.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-utils/before-build-mac.sh b/ci-utils/before-build-mac.sh
index b954f90b..05490240 100644
--- a/ci-utils/before-build-mac.sh
+++ b/ci-utils/before-build-mac.sh
@@ -13,7 +13,7 @@ mv "$HOST_HOME_DIR/cargo-home-dirs/$ver/.cargo" \
   "$HOST_HOME_DIR/" || true
 
 # check if cargo avail and download if not
-if ! cargo -V; then
+if ! { cargo -V && rustup -V; }; then
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 else
   echo "Rust toolchain already installed/restored, not downloading again"
diff --git a/ci-utils/before-build-win.sh b/ci-utils/before-build-win.sh
index c515dc33..b98f1357 100644
--- a/ci-utils/before-build-win.sh
+++ b/ci-utils/before-build-win.sh
@@ -13,7 +13,7 @@ mv "$HOST_HOME_DIR_UNIX/cargo-home-dirs/$ver/.cargo" \
   "$HOST_HOME_DIR_UNIX/" || true
 
 # check if cargo avail and download if not
-if ! cargo -V; then
+if ! { cargo -V && rustup -V; }; then
   curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 else
   echo "Rust toolchain already installed/restored, not downloading again"