commit c0a8e7b0cf428decff66b3054b41ca5d2d8d54ee
author Rob Mohr <mohrr@google.com> Mon Nov 02 15:22:38 2020 -0800
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Nov 02 23:38:10 2020 +0000
tree dfdc9f0a1f1ff44c138d0d7f66355fe3a4b19dbd
parent 2fb36b9a08a08039ff769a2d9644f43a6ecf61e5

pw_env_setup: Check for _pw_deactivate

Check whether function _pw_deactivate exists before calling it.

Change-Id: If2395788cb1cee1432dbce3d752efb52d7bc4058
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/23165
Reviewed-by: Joe Ethier <jethier@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>

pw_env_setup/util.sh

diff --git a/pw_env_setup/util.sh b/pw_env_setup/util.sh
index c624c5c..dee793f 100644
--- a/pw_env_setup/util.sh
+++ b/pw_env_setup/util.sh
@@ -158,7 +158,9 @@
 
   # If there's a _pw_deactivate function run it. Redirect output to /dev/null
   # in case _pw_deactivate doesn't exist.
-  _pw_deactivate &> /dev/null
+  if [ -n "$(command -v _pw_deactivate)" ]; then
+    _pw_deactivate &> /dev/null
+  fi
 
   # Restore PW_ROOT.
   PW_ROOT="$_NEW_PW_ROOT"