Merge "Fix: Isolate SBOM PATH flag"

diff --git a/releasenotes/notes/smart-venv-activate-f7f691e15cf0bde4.yaml b/releasenotes/notes/smart-venv-activate-f7f691e15cf0bde4.yaml
new file mode 100644 (file)
index 0000000..8a7d3f7
--- /dev/null
+++ b/releasenotes/notes/smart-venv-activate-f7f691e15cf0bde4.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Post-build script capture-instance-metadata.sh will attempt to choose the
+    best possible version of Python to use. If the ``$PYTHON`` variable is set,
+    this will be used. If not, we check to see if ``python3`` is available,
+    as this should point to the latest version. If this is also not available,
+    we run with the basic ``python`` command.

diff --git a/shell/capture-instance-metadata.sh b/shell/capture-instance-metadata.sh
index 0648d1d..172ed10 100644 (file)
--- a/shell/capture-instance-metadata.sh
+++ b/shell/capture-instance-metadata.sh
@@ -14,7 +14,13 @@ echo "---> capture-instance-metadata.sh"
 # shellcheck disable=SC1090
 source ~/lf-env.sh
 
-lf-activate-venv --python python3.8 lftools
+if [[ "${PYTHON:-}" -ne "" ]]; then
+    lf-activate-venv --python $PYTHON lftools
+elif python3; then
+    lf-activate-venv --python python3 lftools
+else
+    lf-activate-venv lftools
+fi
 
 # detect if we're in EC2
 if [ -n "${NOMAD_DC}" ]; then