segregate out rust vars

They should be set on Ubuntu, but not Nix: for Nix, .cargo and .rustup should be within project repo to not pollute system.
qdrvm · Nov 4, 2024 · a2f8a40 · a2f8a40
1 parent c7e3e96
commit a2f8a40
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/scripts/.env b/scripts/.env
@@ -1,7 +1,3 @@
-RUST_VERSION=1.77.0
-RUSTUP_HOME=~/.rustup
-CARGO_HOME=~/.cargo
-
 CMAKE_VERSION="3.25"
 CMAKE_CORE_NUMBER=6
 

diff --git a/scripts/.rust_env b/scripts/.rust_env
@@ -0,0 +1,5 @@
+RUST_VERSION=1.77.0
+RUSTUP_HOME=~/.rustup
+CARGO_HOME=~/.cargo
+
+PATH="${CARGO_HOME}/bin:${PATH}"
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -4,7 +4,13 @@ current_dir=$(dirname $(readlink -f "$0"))
 parent_dir=$(dirname "$current_dir")
 cd $parent_dir
 
-set -a; source $current_dir/.env; set +a #include .env vars 
+ #include .env vars and optionally .rust_env vars
+set -a;
+if [ -z "$FLAKE_INITIATED" ]; then
+    source $current_dir/.rust_env;
+fi
+source $current_dir/.env;
+set +a
 
 source $parent_dir/venv/bin/activate
 cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release

diff --git a/scripts/init.sh b/scripts/init.sh
@@ -4,7 +4,13 @@ current_dir=$(dirname $(readlink -f "$0"))
 parent_dir=$(dirname "$current_dir")
 cd $parent_dir
 
-set -a; source $current_dir/.env; set +a #include .env vars 
+#include .env vars and optionally .rust_env vars
+set -a;
+if [ -z "$FLAKE_INITIATED" ]; then
+    source $current_dir/.rust_env;
+fi
+source $current_dir/.env;
+set +a
 
 # if not using nix, install the following packages
 if [ -z "$FLAKE_INITIATED" ]; then