From 04ab545cb7ca4b888ab5baf9c144f7b57f28d2fa Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 20 Nov 2025 17:34:55 -0700
Subject: [PATCH] Use cargo fetch when cookbook_redoxer not found

---
 mk/fstools.mk     | 14 ++++++--------
 src/cook/fetch.rs |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mk/fstools.mk b/mk/fstools.mk
index b2523da0..08c7413e 100644
--- a/mk/fstools.mk
+++ b/mk/fstools.mk
@@ -14,17 +14,15 @@ else
 	rm -rf $@ $@.partial
 	mkdir -p $@.partial
 	ln -sr recipes $@.partial/recipes
-	ln -sr $@-target $@.partial/target
 
 	# Install cookbook, installer, and redoxfs for host (may be outside of podman container)
 	#TODO: Build and install installer and redoxfs using cookbook?
-	export CARGO_TARGET_DIR=$@.partial/target && \
-		$(HOST_CARGO) install --root $@.partial --path . && \
-		cd $@.partial && \
-		./bin/repo fetch installer redoxfs && \
-		cd ../.. && \
-		$(HOST_CARGO) install --root $@.partial --path recipes/core/installer/source && \
-		$(HOST_CARGO) install --root $@.partial --path recipes/core/redoxfs/source
+	cd $@.partial && \
+		export CARGO_TARGET_DIR=../$@-target && \
+		$(HOST_CARGO) install --root . --path ../.. && \
+		env -u RUSTUP_TOOLCHAIN ./bin/repo fetch installer redoxfs && \
+		$(HOST_CARGO) install --root . --path recipes/core/installer/source && \
+		$(HOST_CARGO) install --root . --path recipes/core/redoxfs/source
 
 	mv $@.partial $@
 	touch $@
diff --git a/src/cook/fetch.rs b/src/cook/fetch.rs
index 1b31d96b..7536d6e7 100644
--- a/src/cook/fetch.rs
+++ b/src/cook/fetch.rs
@@ -405,7 +405,7 @@ pub(crate) fn fetch_cargo(
     } else {
         let cookbook_redoxer = Path::new("target/release/cookbook_redoxer")
             .canonicalize()
-            .unwrap_or(PathBuf::from("/bin/false"));
+            .unwrap_or(PathBuf::from("cargo"));
         Command::new(&cookbook_redoxer)
     };
     command.arg("fetch");