fix mismerge, set CHIP_ROOT unconditionally

project-chip · Oct 20, 2020 · fb33d35 · fb33d35
1 parent 829f33c
commit fb33d35
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -14,17 +14,11 @@
 # 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