From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6741467829768290304 X-Received: by 2002:a1c:48d5:: with SMTP id v204mr8964886wma.109.1569620641627; Fri, 27 Sep 2019 14:44:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f5c1:: with SMTP id k1ls1153867wrp.0.gmail; Fri, 27 Sep 2019 14:44:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqzh+DyizS+LpaZY9y+Vmta5KS46S+hyJWV9DteSZD6G1md1N0K7ORTtSjT6VevI+Icty5J3 X-Received: by 2002:adf:d08b:: with SMTP id y11mr4762231wrh.50.1569620641346; Fri, 27 Sep 2019 14:44:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569620641; cv=none; d=google.com; s=arc-20160816; b=favlU6nLVD7Osa5imd13sUZXE3M6eS5Ajdw4c5gIg/UYCUEn7YGfPbyVATiyWzH3tj Hi8QzFyij3veZXnTfU6B7wI8C8be6K1SDXNGB0zKOQjUn2Idbof+AJgraNov+UefReVt 6heid69iPnn/OBoaW3aQdxINQnePFIJlhnmnLJR7zAc/DejhjhxxCEGQpCHoJukPC3l/ fZW65DuO8nSVkQemQGHZ4YsPTtrQ260YfhP19LZpw7IJJdNzADkF2MCEytYOE0+gdOuR cOYYhxHjGK348prE6pxAG3ccmeOdpM9u0QVdh9big+zJYzuMS9p/m2BJhn8D5WgyRDwz vZtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ppvn4HrRzU7kHHuG1ZmHiBsRd0YPmh1mmeQQhdKGI7A=; b=FqakBm2WnSqLyuGOdBGHG/dTNsGkHsXBk7hJGq5/mgn46CemFzDkFHGwCNOkoQ9n6b MopKucUo+X6zwyQfK3ejHC+wjBX+Soe9rd+rkMR245ihFUxCP/+ZwLBfVSaMqKFwXesY Q830qOXqzlNndNLRZ6NIBlkBdMRuPVzeOUmcJfQUU+UqjA7MXdBEIywguRJKpHWYKIDn qOGUd2Fz1JAkX0/LTl/W6tdiWC0D/nFKbBKCdoJhreNsCXnNxvjrZFHE2whuUvlE7RgG vSHkPBT4CqEYBhB1U1D3JLcpeniPR6wUG7g8VR+Q7gsNImWwBHOVlAyfFbK5eP4D0ccd xEwA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MrUdM8JB; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 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-x442.google.com (mail-wr1-x442.google.com. [2a00:1450:4864:20::442]) by gmr-mx.google.com with ESMTPS id p5si330135wmg.0.2019.09.27.14.44.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Sep 2019 14:44:01 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 as permitted sender) client-ip=2a00:1450:4864:20::442; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MrUdM8JB; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::442 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-x442.google.com with SMTP id y19so4757921wrd.3 for ; Fri, 27 Sep 2019 14:44:01 -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:in-reply-to:references; bh=Ppvn4HrRzU7kHHuG1ZmHiBsRd0YPmh1mmeQQhdKGI7A=; b=MrUdM8JB6RbGoNp9T6HNpjnVid847bf0knOKnzD7ELeCNnUdlCtuCNe0T0FmF54oHf n5KwL/SuroH4ANQ3x/5CRlw8YJWCACcsNdcLyzIU/tWeEECdgLx/Bq/goMMRGaYnYDIS OjUwI4jY8YqdeGQHrvlcgsjW/q+HTju4IHIh8hv9A/dDCFfnwmj+X0NLHj3Y56GZ29hq bZE/eALK2evcu89zarsRwGF0uqU4AAfUmGvkzHINyHuQxq0e/olSFuLn1sAqw40vya8a BcAn+xri9g4uKwqhseu6iVsaAlosK51LI3FVFtpExwV8KI8dG0mEYMTrjbcycH84CiMm bPhw== 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:in-reply-to :references; bh=Ppvn4HrRzU7kHHuG1ZmHiBsRd0YPmh1mmeQQhdKGI7A=; b=sUNGxIrvbWjPnndplBxPrKxpczebWJNVR55wgfaKT2rWB9Evwzqvhl1eHC+NG7Zlsc xEJDdRV1Stwrr5EuUut4KtsgqfNQsUcTKE2+2kLLc895cEr0K4q+j6Xhl1bM83kI8LHX StRDBGmTlM46ZcBPD903ntPO01kxAG/LRrId/gu1uAYGu9o63QI6v/DHo4wk4onkoN0s U/vOJ5W+fqAYITg66hCVrp7hZZIdkHdxcrltxBheCyPvnerqUM/m2CNTK/bj/COSLcSL 8wR2TURRPifiBCs420Kf/bYENX7F+OOlTHaunYmoc4lS2vpIY70gbYTeTx2Ydg2Mly39 evaA== X-Gm-Message-State: APjAAAVTR+9GP3p0S4FimzdpkWh0a/mgBxiiqb1/HUMMZQ7hfWrsRYFa 5TMYDMW07MPyIX7ypbzJLvc1s/PHNj8= X-Received: by 2002:adf:cf06:: with SMTP id o6mr4533917wrj.366.1569620640745; Fri, 27 Sep 2019 14:44:00 -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 t18sm8080669wmi.44.2019.09.27.14.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 14:44:00 -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 v2] isar-init-build-env: Always set ISARROOT Date: Sat, 28 Sep 2019 03:13:52 +0530 Message-Id: <20190927214352.32114-1-Vijaikumar_Kangarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927213804.31651-1-Vijaikumar_Kangarajan@mentor.com> References: <20190927213804.31651-1-Vijaikumar_Kangarajan@mentor.com> X-TUID: JKztTENBPClC 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 --- 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