From 3f323673e00dcaebd464ccce8c95544d8973388e Mon Sep 17 00:00:00 2001
From: John Doe <johndoe@example.com>
Date: Tue, 10 Mar 2026 15:56:55 -0400
Subject: [PATCH] fix: source cargo env to make cargo available in current
 shell

---
 ct/drop.sh              |  6 ++----
 install/drop-install.sh | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ct/drop.sh b/ct/drop.sh
index d47d1930c..bfbd9170d 100644
--- a/ct/drop.sh
+++ b/ct/drop.sh
@@ -63,7 +63,8 @@ function update_script() {
   msg_info "Installing Dependencies"
   cd /opt/drop || exit
   export PNPM_HOME="/root/.local/share/pnpm"
-  export PATH="/root/.cargo/bin:$PNPM_HOME:$PATH"
+  export PATH="$PNPM_HOME:$PATH"
+  source /root/.cargo/env
   $STD pnpm install
   msg_ok "Installed Dependencies"
 
@@ -74,14 +75,11 @@ function update_script() {
 
   msg_info "Building Torrential"
   cd /opt/drop/torrential || exit
-  export PATH="/root/.cargo/bin:$PATH"
   $STD cargo build --release
   msg_ok "Built Torrential"
 
   msg_info "Running Database Migrations"
   cd /opt/drop || exit
-  export PNPM_HOME="/root/.local/share/pnpm"
-  export PATH="/root/.cargo/bin:$PNPM_HOME:$PATH"
   $STD npm install prisma@7.3.0 dotenv
   source /opt/drop/.env
   $STD npx prisma migrate deploy
diff --git a/install/drop-install.sh b/install/drop-install.sh
index 570c2f513..31fe65ab1 100644
--- a/install/drop-install.sh
+++ b/install/drop-install.sh
@@ -23,7 +23,8 @@ $STD apt install -y \
   build-essential \
   pkg-config \
   libssl-dev \
-  libpq-dev
+  libpq-dev \
+  curl
 msg_ok "Installed Dependencies"
 
 # =============================================================================
@@ -37,6 +38,16 @@ PG_DB_NAME="drop" PG_DB_USER="drop" setup_postgresql_db
 
 get_lxc_ip
 
+# =============================================================================
+# INSTALL RUST
+# =============================================================================
+
+msg_info "Installing Rust"
+$STD curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+# Source the cargo environment to make cargo available in current shell
+source /root/.cargo/env
+msg_ok "Installed Rust"
+
 # =============================================================================
 # DOWNLOAD & BUILD APPLICATION
 # =============================================================================
@@ -63,11 +74,6 @@ msg_ok "Built Drop Application"
 # BUILD TORRENTIAL (Rust component)
 # =============================================================================
 
-msg_info "Installing Rust"
-$STD curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-export PATH="/root/.cargo/bin:$PATH"
-msg_ok "Installed Rust"
-
 msg_info "Building Torrential"
 cd /opt/drop/torrential || exit
 $STD cargo build --release