From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6741467829768290304 X-Received: by 2002:adf:dc03:: with SMTP id t3mr5022108wri.27.1569620293481; Fri, 27 Sep 2019 14:38:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f5c1:: with SMTP id k1ls1150373wrp.0.gmail; Fri, 27 Sep 2019 14:38:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxK3sR9Yg88C4x1QETbwPDSXls7o4axgIvfbluLlU2kn03+JujwRRBPCJ4Ej6LcLnhDQ46o X-Received: by 2002:adf:f2cd:: with SMTP id d13mr1570972wrp.143.1569620293096; Fri, 27 Sep 2019 14:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569620293; cv=none; d=google.com; s=arc-20160816; b=xsNJe4hKZjdhgchQUkfZoJsNcW18BK4znQEayTpbiUy5iTdTR0pBNA1eVITYEKmqlp 0lEnoBkVNme5PJaFRARIv3swVPwN1cj5huNEQzaTbK6thTECZ3HoYwSb1Bp4heDFC8QN F83JpJ67PjUloCW+trdL+Tp8vmNIiGODMNsP6p7EjqQyN53JKfyYftHZmpWxageIoiQI w39NSQZjx+hDDfK6hRsLlq97FdLhDymCX2nLfOmxKIrVmnR0widBHMU4Ko5/4NCx5Ctw A4BKvKM/UdkTNDQBo0LBEcd1DQaE77eNW0TzxbHbzN4aXi0M9LofR3aTxIwt0phbvRln l2DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=RoiKUL+ZzamIRBsJQN+ZDINYUlo3bUQ+mpYsA6BJiuc=; b=izZYfbPuSZgfmizpYTks0iw/PM84mDvS4w/hz8DuXJ9/9KZwaDo2XdBEXrWaueABzJ CsHBVzzCv+teEV8pAoAmnKiBdF4k/nZ3zdJ8+pjPSTh8a9D8YSkt3Skd/T5iuPmWYbs1 +z/OmsYKondhgj4a6b45WIT9ieK/0IGmhUsUoPoGEnqZdYeEBPZ+6bLghxpcg532Iu9M pfS9fcnZZ+1Sn/B2bEo8KOmv3jLbnUpk73D/Hxun5NtZ7I3NCyC6CxRfH/zZDJHdDNVs +V4GfMjKArfgfPWBtS+csrWxTJYWhxdCJNJ0zwLBBLMKPUx2MGkxNBaITZqvThlAs/Z/ W8Bw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QmTXjEmN; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::441 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com. [2a00:1450:4864:20::441]) by gmr-mx.google.com with ESMTPS id s65si397342wme.2.2019.09.27.14.38.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Sep 2019 14:38:13 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::441 as permitted sender) client-ip=2a00:1450:4864:20::441; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QmTXjEmN; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::441 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x441.google.com with SMTP id l3so4716952wru.7 for ; Fri, 27 Sep 2019 14:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RoiKUL+ZzamIRBsJQN+ZDINYUlo3bUQ+mpYsA6BJiuc=; b=QmTXjEmNvPRlRloIJD5dHgpPF0rDMWEUqVjlEFLWHdvSUFh0X0BdVmKccYDmiL0JBU GXa4TxZddO7jF9oabZbRrcBszp2HHzv6PMrg5Z1dnncdBFAyNpybyiHgQ05DJOBRe0OE jIeQnAw88XufM9kLIj1tloSlqM9m+idbFjqTZ6x9ruZfBSTNT8Aj2IGthVl8wZhdaOGY ep6lRL0q6w7dtA5SOhp9sen14EH7T9MyDMNj3c9DLtEl8o0alo4GoKjyg3NLsnQneIdg scml5QW1XTQYUCT4fb2dHp9iKrA06e2KYDPx/GslTtqs/asUkbfh1Qk88mHBJYkf6MM/ Ra/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RoiKUL+ZzamIRBsJQN+ZDINYUlo3bUQ+mpYsA6BJiuc=; b=J3acBcGgLMmxfi40aFzLhs3+lN514fMSr+V/RyZyqXyHzCXLMPecWUbgoVomChpIgn nH+nHXeqQImSa3o2o4UFeuR3YuIHkguyOpP+jAEEfAtIjkpzFei69kLrkUQVVkvoknmg D1l9PpCQbYR6yDbbAnFUMX9CSS9rb1iV8fuhBhzvs7vmsRgRWp+Ci7oEYv1aIaiOWAGJ M13uC2HS0bneLU7mcG9kuHpxWRpRk1DndPsS8bcBHD6gjKvYyuVrUV8Dj6awgmlYo1yr k1ZIZ/WpYxtWk0CwYxiiMxFCH1JyuULCg3CIWpPUtWfFjyMuyLL3aKMw+lKipm4Cdgw2 w3KQ== X-Gm-Message-State: APjAAAWNTIwuyslcoAsT3++CNr6lC2CN4rzGzT+cELM2vVoAJH5NqB/4 K03Fvcja8T9t0AxmU3ENyuqUc97tMAA= X-Received: by 2002:a5d:6943:: with SMTP id r3mr4418932wrw.21.1569620292490; Fri, 27 Sep 2019 14:38:12 -0700 (PDT) Return-Path: Received: from lightning.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id v6sm13115488wma.24.2019.09.27.14.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 14:38:12 -0700 (PDT) From: vijaikumar.kanagarajan@gmail.com X-Google-Original-From: Vijaikumar_Kangarajan@mentor.com To: isar-users@googlegroups.com, henning.schild@siemens.com, claudius.heine.ext@siemens.com Cc: jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH] isar-init-build-env: Always set ISARROOT Date: Sat, 28 Sep 2019 03:08:04 +0530 Message-Id: <20190927213804.31651-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 X-TUID: VyC6MIuYuqrF From: Vijai Kumar K 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 --- isar-init-build-env | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/isar-init-build-env b/isar-init-build-env index b08bb59..9c308e4 100755 --- a/isar-init-build-env +++ b/isar-init-build-env @@ -42,10 +42,8 @@ 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") -- 2.17.1