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

…12916)
matrix-org · May 30, 2022 · 1fd1856 · 1fd1856
1 parent 7f92ac4
commit 1fd1856
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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.
diff --git 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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Check if we are in a virtual environment before overriding the `PYTHONPATH` environment variable in the demo script.