commit 428e479901d575d774f6ffb4c2b89fb50973af5d
author Rob Mohr <mohrr@google.com> Tue Oct 27 11:46:43 2020 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 29 19:05:56 2020 +0000
tree 1a1705166b2089e27c3014a33295ee9ea71925bd
parent 27435c7a8a42e21adb666cb4bddfc9d3e52f9fef

pw_env_setup: Run deactivate if detected

Run deactivate.sh if found at the beginning of bootstrap. This should
allow shells to be reused for different projects.

Change-Id: I8af4de92b528a81c4afeb822699d2e016ffcb42f
Bug: 278
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/22580
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>

bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index 8321bf3..246d007 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -71,6 +71,7 @@
 
 . "$PW_ROOT/pw_env_setup/util.sh"
 
+pw_deactivate
 pw_eval_sourced "$_pw_sourced"
 pw_check_root "$PW_ROOT"
 _PW_ACTUAL_ENVIRONMENT_ROOT="$(pw_get_env_root)"