From a3be8e986be9ab6712ce5d28e85d361bf1898fef Mon Sep 17 00:00:00 2001
From: Matthias Mair <code@mjmair.com>
Date: Wed, 5 Feb 2025 23:17:42 +0100
Subject: [PATCH] chore(contrib): include pkg source in pkg logging (#9035)
* fix(backend): wrong path for version was used
* chore(contrib): Include Pkg source in pkg logging
---
contrib/packager.io/functions.sh | 12 ++++++++++++
src/backend/InvenTree/InvenTree/settings.py | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/contrib/packager.io/functions.sh b/contrib/packager.io/functions.sh
index a08a9f0999..9ade8d1dc8 100755
--- a/contrib/packager.io/functions.sh
+++ b/contrib/packager.io/functions.sh
@@ -120,6 +120,18 @@ function detect_local_env() {
echo "# POI02| Printing local envs - after #++#"
printenv
fi
+
+ # Print branch and dir from VERSION file
+ if [ -f "${APP_HOME}/VERSION" ]; then
+ echo "# POI02| Loading environment variables from VERSION file"
+ content=$(cat "${APP_HOME}/VERSION")
+ # use grep to get the branch and target
+ INVENTREE_PKG_BRANCH=($(echo $content | grep -oP 'INVENTREE_PKG_BRANCH=\K[^ ]+'))
+ INVENTREE_PKG_TARGET=($(echo $content | grep -oP 'INVENTREE_PKG_TARGET=\K[^ ]+'))
+ echo "Running in a package environment build on branch $INVENTREE_PKG_BRANCH for target $INVENTREE_PKG_TARGET"
+ else
+ echo "# POI02| VERSION file not found"
+ fi
}
function detect_envs() {
diff --git a/src/backend/InvenTree/InvenTree/settings.py b/src/backend/InvenTree/InvenTree/settings.py
index 17c60cea60..1072090d19 100644
--- a/src/backend/InvenTree/InvenTree/settings.py
+++ b/src/backend/InvenTree/InvenTree/settings.py
@@ -70,7 +70,7 @@ BASE_DIR = config.get_base_dir()
CONFIG = config.load_config_data(set_cache=True)
# Load VERSION data if it exists
-version_file = BASE_DIR.parent.joinpath('VERSION')
+version_file = BASE_DIR.parent.parent.parent.joinpath('VERSION')
if version_file.exists():
print('load version from file')
load_dotenv(version_file)