From 60f324518b0c674cdc33886186701e70df29f255 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 1 Oct 2023 12:09:36 -0700 Subject: [PATCH] Revert "provision: enabling automatic activation of zulip-py3-venv at the lunch of shell only for dedicated containers." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ba4c45aa90e9da9be30289742c4c204e1c981797. The tests it used don’t make sense. Signed-off-by: Anders Kaseorg --- tools/lib/provision_inner.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/lib/provision_inner.py b/tools/lib/provision_inner.py index f77dac21a3..da6520e99a 100755 --- a/tools/lib/provision_inner.py +++ b/tools/lib/provision_inner.py @@ -93,16 +93,8 @@ def setup_shell_profile(shell_profile: str) -> None: with open(shell_profile_path, "w") as shell_profile_file: shell_profile_file.writelines(command + "\n") - # Check if the environment is one of the dedicated containers: Vagrant, Docker, Droplet or WSL2 - WSL = os.path.exists("/proc/sys/fs/binfmt_misc/WSLInterop") - vagrant = os.path.exists("/vagrant") - docker = os.path.exists("/var/run/docker.sock") - droplet = os.path.exists("/etc/digitalocean") - # If the environment matches one of the containers, write the activation command to the user's bash profile - if WSL or vagrant or docker or droplet: - source_activate_command = "source " + os.path.join(VENV_PATH, "bin", "activate") - write_command(source_activate_command) - + source_activate_command = "source " + os.path.join(VENV_PATH, "bin", "activate") + write_command(source_activate_command) if os.path.exists("/srv/zulip"): write_command("cd /srv/zulip")