From 9abfd9e5a97d259290ac08d9c36094ce90f9d8b7 Mon Sep 17 00:00:00 2001
From: BodgeMaster <>
Date: Fri, 30 Sep 2022 17:53:11 +0200
Subject: [PATCH] setupenv: Move sourcing the local environment before FOSS-VG
 environment adjustments

---
 setupenv.bashrc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setupenv.bashrc b/setupenv.bashrc
index e1a92a3..893b4b9 100644
--- a/setupenv.bashrc
+++ b/setupenv.bashrc
@@ -18,6 +18,11 @@ echo ">>> Loading shell environment for FOSS-VG development..."
 PROJECT_BASE_DIR="$( cd -- "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 ; pwd -P )"
 echo "Project base directory is $PROJECT_BASE_DIR"
 
+if [ -f "$PROJECT_BASE_DIR/.localenv.bashrc" ]; then
+    source "$PROJECT_BASE_DIR/.localenv.bashrc"
+    echo "Applied local environment customizations."
+fi
+
 alias clean="pushd \"$PROJECT_BASE_DIR\" >/dev/null 2>&1; scripts/clean.sh; popd >/dev/null 2>&1"
 alias clean_dependencies="pushd \"$PROJECT_BASE_DIR\" >/dev/null 2>&1; scripts/clean_dependencies.sh; popd >/dev/null 2>&1"
 alias setup_project="pushd \"$PROJECT_BASE_DIR\" >/dev/null 2>&1; scripts/setup_project.sh; popd >/dev/null 2>&1"
@@ -46,11 +51,6 @@ else
 fi
 echo "LD_LIBRARY_PATH is $LD_LIBRARY_PATH"
 
-if [ -f "$PROJECT_BASE_DIR/.localenv.bashrc" ]; then
-    source "$PROJECT_BASE_DIR/.localenv.bashrc"
-    echo "Loaded local environment customizations."
-fi
-
 echo ">>> Checking for dependencies..."
 MISSING_DEPS=0