demo: check if we are in a virtualenv before overriding PYTHONPATH (#12916)

2022-05-30 17:41:24 +02:00 · 2022-05-30 17:41:24 +02:00 · 1fd1856afc
parent 7f92ac4c1c
commit 1fd1856afc
2 changed files with 7 additions and 5 deletions
--- a/changelog.d/12916.misc
+++ b/changelog.d/12916.misc
@ -0,0 +1 @@
+Check if we are in a virtual environment before overriding the `PYTHONPATH` environment variable in the demo script.
--- a/demo/start.sh
+++ b/demo/start.sh
@ -6,11 +6,12 @@ CWD=$(pwd)

 cd "$DIR/.." || exit

-PYTHONPATH=$(readlink -f "$(pwd)")
-export PYTHONPATH
-
-
-echo "$PYTHONPATH"
+# Do not override PYTHONPATH if we are in a virtual env
+if [ "$VIRTUAL_ENV" = "" ]; then
+    PYTHONPATH=$(readlink -f "$(pwd)")
+    export PYTHONPATH
+	echo "$PYTHONPATH"
+fi

 # Create servers which listen on HTTP at 808x and HTTPS at 848x.
 for port in 8080 8081 8082; do
				`@ -0,0 +1 @@`
				Check if we are in a virtual environment before overriding the `PYTHONPATH` environment variable in the demo script.