commit 582586b1a1cd570080d4466f9f4f179724b9888d
author Rob Mohr <mohrr@google.com> Fri Nov 13 12:33:06 2020 -0800
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 17 17:11:22 2020 +0000
tree 7ca8be5e44a0a9f75a3aaeb6f4dce63f65032395
parent fbe68ff8584b75cf9986963d2e48b9d67ff697fe

pw_env_setup: Move env dir to project root

Change-Id: I9739ac75e0782c7d95c1d74a762026a9a71b25ae
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/24660
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: David Rogers <davidrogers@google.com>

pw_env_setup/util.sh

diff --git a/pw_env_setup/util.sh b/pw_env_setup/util.sh
index 2a1168f..0c9f2e4 100644
--- a/pw_env_setup/util.sh
+++ b/pw_env_setup/util.sh
@@ -105,7 +105,11 @@
   # PW_ENVIRONMENT_ROOT came from the developer and not from a previous
   # bootstrap possibly from another workspace.
   if [ -z "$PW_ENVIRONMENT_ROOT" ]; then
-    echo "$PW_ROOT/.environment"
+    if [ -n "$PW_PROJECT_ROOT" ]; then
+      echo "$PW_PROJECT_ROOT/.environment"
+    else
+      echo "$PW_ROOT/.environment"
+    fi
   else
     echo "$PW_ENVIRONMENT_ROOT"
   fi