[PATCH v2] isar-init-build-env: Always set ISARROOT

[vijaikumar.kanagarajan@gmail.com]

From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>

When switching between two ISAR workspaces in the same shell
session, the ISARROOT setting of the previous workspace would be
picked up for the new workspace resulting in an incorrect
configuration.

Always set ISARROOT irrespective of whether it is empty or not.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
Changes in v2:
    - Remove redundant code

 isar-init-build-env | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/isar-init-build-env b/isar-init-build-env
index b08bb59..404efcb 100755
--- a/isar-init-build-env
+++ b/isar-init-build-env
@@ -42,13 +42,10 @@ if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then
     exit 1
 fi
 
-if [ -z "$ISARROOT" ]; then
-    ISARROOT=$(dirname "$THIS_SCRIPT")
-    ISARROOT=$(readlink -f "$ISARROOT")
-fi
+ISARROOT=$(dirname "$THIS_SCRIPT")
+ISARROOT=$(readlink -f "$ISARROOT")
 unset THIS_SCRIPT
 
-ISARROOT=$(readlink -f "$ISARROOT")
 export ISARROOT
 . "$ISARROOT/scripts/isar-buildenv-internal" "$1" && \
     TEMPLATECONF="$TEMPLATECONF" "$ISARROOT/scripts/isar-setup-builddir" || {
-- 
2.17.1