From 5d9bb921f0b1423c88e814a41eba58b6beaa2083 Mon Sep 17 00:00:00 2001
From: Pavlos Rontidis <pavlos.rontidis@gmail.com>
Date: Tue, 4 Mar 2025 08:54:48 -0500
Subject: [PATCH] try a new way to feed active toolchain to the install command

---
 .github/workflows/msrv.yml     | 3 +--
 scripts/environment/prepare.sh | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
index b0c79c80465a9..18a70126da711 100644
--- a/.github/workflows/msrv.yml
+++ b/.github/workflows/msrv.yml
@@ -20,7 +20,6 @@ jobs:
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: |
           # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain.
-          TOOLCHAIN="$(rustup show active-toolchain | awk '{print $1;}')"
-          rustup toolchain install "${TOOLCHAIN}"
+          rustup show active-toolchain || rustup toolchain install
       - run: cargo install cargo-msrv --version 0.15.1
       - run: cargo msrv verify
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
index 5ae685203753d..f7b0f2508516b 100755
--- a/scripts/environment/prepare.sh
+++ b/scripts/environment/prepare.sh
@@ -3,8 +3,7 @@ set -e -o verbose
 
 git config --global --add safe.directory /git/vectordotdev/vector
 
-TOOLCHAIN="$(rustup show active-toolchain | awk '{print $1;}')"
-rustup toolchain install "${TOOLCHAIN}"
+rustup show active-toolchain || rustup toolchain install
 rustup show
 if [[ "$(cargo-deb --version)" != "2.0.2" ]] ; then
   rustup run stable cargo install cargo-deb --version 2.0.0 --force --locked