summary refs log tree commit diff
path: root/demo/start.sh
diff options
context:
space:
mode:
authorMathieu Velten <mathieuv@matrix.org>2022-05-30 17:41:24 +0200
committerGitHub <noreply@github.com>2022-05-30 15:41:24 +0000
commit1fd1856afc4155ee47b3be9829b02d740f9a64d6 (patch)
tree5d53bdafe100e0924cd05f0dd2cf9118483d95ba /demo/start.sh
parentAdd a migration step to cleanup potential leftovers of bug 11833 (#12784) (diff)
downloadsynapse-1fd1856afc4155ee47b3be9829b02d740f9a64d6.tar.xz
demo: check if we are in a virtualenv before overriding PYTHONPATH (#12916)
Diffstat (limited to '')
-rwxr-xr-xdemo/start.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/demo/start.sh b/demo/start.sh
index 96b3a2ceab..fdd75816fb 100755
--- 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