From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1158548-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CE751138350
for <garchives@archives.gentoo.org>; Fri, 3 Apr 2020 07:48:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A6E52E0C14;
Fri, 3 Apr 2020 07:48:24 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9305AE0C14
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Apr 2020 07:48:24 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 73E1034EF5B
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Apr 2020 07:48:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E47E1C1
for <gentoo-commits@lists.gentoo.org>; Fri, 3 Apr 2020 07:48:19 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1585900065.aa1f74d71970c74b8bce1d25ea16f8aa24ffeb6c.mattst88@gentoo>
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/support/functions.sh
X-VCS-Directories: targets/support/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: aa1f74d71970c74b8bce1d25ea16f8aa24ffeb6c
X-VCS-Branch: master
Date: Fri, 3 Apr 2020 07:48:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bbf883b8-ae99-44ef-aa99-8666c01fe211
X-Archives-Hash: ff1faab96df306879a03a05a6a4f512c
commit: aa1f74d71970c74b8bce1d25ea16f8aa24ffeb6c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 3 05:25:23 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 3 07:47:45 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=aa1f74d7
targets: Inline chroot_path variable
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/support/functions.sh | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 1268b0d1..d3414f80 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -19,20 +19,17 @@ exec_in_chroot() {
copy_to_chroot ${1}
copy_to_chroot ${clst_shdir}/support/chroot-functions.sh
- chroot_path=${clst_chroot_path}
-
# Ensure the file has the executable bit set
- chmod +x ${chroot_path}/tmp/${file_name}
+ chmod +x ${clst_chroot_path}/tmp/${file_name}
echo "Running ${file_name} in chroot:"
- echo " ${clst_CHROOT} ${chroot_path} /tmp/${file_name}"
- ${clst_CHROOT} "${chroot_path}" "/tmp/${file_name}" || exit 1
+ echo " ${clst_CHROOT} ${clst_chroot_path} /tmp/${file_name}"
+ ${clst_CHROOT} "${clst_chroot_path}" "/tmp/${file_name}" || exit 1
delete_from_chroot /tmp/${file_name}
delete_from_chroot /tmp/chroot-functions.sh
}
-#return codes
die() {
echo "$1"
exit 1