* merge activate and bootstrap

    * run activate in an external env from the Xcode connector
    * fix pip install nits

scripts/activate.sh

@@ -0,0 +1 @@
+bootstrap.sh

scripts/bootstrap.sh

@@ -14,10 +14,18 @@
 # limitations under the License.
 #
 
+if [[ ! -d ${CHIP_ROOT} ]]; then
+    if [[ -n ${BASH_SOURCE[0]} ]]; then
+        CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
+    else
+        CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
+    fi
+fi
+
 if [[ -n ${BASH_SOURCE[0]} ]]; then
-    CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
+    me=${BASH_SOURCE[0]##*/}
 else
-    CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
+    me=${0##*/}
 fi
 
 export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"
@@ -32,10 +40,12 @@ git submodule update --init
 
 export PW_VIRTUALENV_SETUP_PY_ROOTS="$CHIP_ROOT/integrations/mobly"
 
+export PATH # https://bugs.chromium.org/p/pigweed/issues/detail?id=281
+
 # shellcheck source=/dev/null
-source "$CHIP_ROOT/third_party/pigweed/repo/bootstrap.sh"
+source "$CHIP_ROOT/third_party/pigweed/repo/$me"
 
 #TODO - remove this once native python building is solved for
 #       psutil (one of mobly's dependencies which CHIP does
 #       not actually need, so --no-deps is OK)
-pip install --no-deps portpicker mobly
+pip install --quiet --upgrade --no-deps portpicker mobly

src/darwin/Framework/chip_xcode_build_connector.sh

@@ -118,15 +118,17 @@ updirs() {
 (
     cd "$CHIP_ROOT" # pushd and popd because we need the env vars from activate
 
-    ENV=$(updirs chip_xcode_build_connector_env.sh)
-    [[ -n $ENV ]] && . "$ENV"
+    if ENV=$(updirs chip_xcode_build_connector_env.sh 2>/dev/null); then
+        . "$ENV"
+    fi
 
     [[ -n $CHIP_NO_SUBMODULES ]] || git submodule update --init
     if [[ -z $CHIP_NO_ACTIVATE ]]; then
+        # first run bootstrap in an external env to build everything
+        env -i PW_ENVSETUP_NO_BANNER=1 PW_ENVSETUP_QUIET=1 bash -c '. scripts/activate.sh'
         set +ex
-        echo PW_ENVSETUP_QUIET=1 . scripts/activate.sh >&2
-        PW_ENVSETUP_QUIET=1 . scripts/activate.sh
-        (($? != 0)) && echo "Please source $CHIP_ROOT/scripts/bootstrap.sh before building" && exit 1
+        # now source activate for env vars
+        PW_ENVSETUP_NO_BANNER=1 PW_ENVSETUP_QUIET=1 . scripts/activate.sh
         set -ex
     fi