From 37b1e1fcfa651e8687eb70ac7d5795c6bb9407d0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 10 May 2024 19:58:56 -0600
Subject: [PATCH] Use stable toolchain for building cargo tools

---
 bootstrap.sh          | 8 +++-----
 podman/rustinstall.sh | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 6adb7c3..49144c2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -897,7 +897,7 @@ rustInstall() {
 	fi
 	# If rustup is not installed we should offer to install it for them
 	if [ -z "$(which rustup)" ]; then
-        rustup_options="--default-toolchain nightly"
+        rustup_options="--default-toolchain stable"
 		echo "You do not have rustup installed."
 		if [ "$noninteractive" = true ]; then
 		   rustup="y"
@@ -924,8 +924,8 @@ rustInstall() {
 	if [ -z "$(which rustc)" ]; then
 		echo "Rust is not installed"
 		echo "Please either run the script again, accepting rustup install"
-		echo "or install rustc nightly manually (not recommended) via:"
-		echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly"
+		echo "or install rustc stable manually (not recommended) via:"
+		echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=stable"
 		exit 1
 	else
 		echo "Your Rust install looks good!"
@@ -999,7 +999,6 @@ if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
 elif [ "$1" == "-u" ]; then
 	git pull upstream master
 	git submodule update --recursive --init
-	rustup update nightly
 	exit
 elif [ "$1" == "-s" ]; then
 	statusCheck
@@ -1034,7 +1033,6 @@ rustInstall "$noninteractive"
 if [ "$update" == "true" ]; then
 	git pull upstream master
 	git submodule update --recursive --init
-	rustup update nightly
 	exit
 fi
 
diff --git a/podman/rustinstall.sh b/podman/rustinstall.sh
index 2036805..89749af 100755
--- a/podman/rustinstall.sh
+++ b/podman/rustinstall.sh
@@ -2,7 +2,7 @@
 
 # Install Rust in Podman, after the image has been built
 
-curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
-cargo install --force --version 0.1.1 cargo-config
-cargo install --force --version 1.16.0 just
-cargo install --force --version 0.26.0 cbindgen
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
+cargo +stable install --force --version 0.1.1 cargo-config
+cargo +stable install --force --version 1.16.0 just
+cargo +stable install --force --version 0.26.0 cbindgen