Fix activate.sh to find CHIP_ROOT (project-chip#1585)

* fix activate.sh * fix bootstrap.sh, too
kedars · Jul 21, 2020 · 741db9d · 741db9d
1 parent 7cf0d80
commit 741db9d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/scripts/activate.sh b/scripts/activate.sh
@@ -13,9 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-if [[ ! -d "${CHIP_ROOT}" ]]; then
-    CHIP_ROOT=$(cd "$(dirname "$0")/.." && pwd)
+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
 
 export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 
-CHIP_ROOT=$(cd "$(dirname "$0")/.." && pwd)
+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
 
 export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"
 export PW_BRANDING_BANNER_COLOR="bold_white"