Fix bootstrapping with relative CHIP_ROOT already set (#3291)

.. by always setting CHIP_ROOT to the right (absolute) value.
project-chip · Dec 7, 2020 · ac777dc · ac777dc
1 parent 2832f8e
commit ac777dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/integrations/mobly/.gitignore b/integrations/mobly/.gitignore
@@ -0,0 +1 @@
+*.egg-info
diff --git a/scripts/activate.sh b/scripts/activate.sh
@@ -13,12 +13,11 @@
 # See the License for the specific language governing permissions and
 # 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
+
+if [[ -n ${BASH_SOURCE[0]} ]]; then
+    CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
+else
+    CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
 fi
 
 export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -14,12 +14,10 @@
 # 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
+if [[ -n ${BASH_SOURCE[0]} ]]; then
+    CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
+else
+    CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
 fi
 
 export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"