From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 DF050138351 for ; Fri, 3 Apr 2020 07:48:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 077EBE0BA4; Fri, 3 Apr 2020 07:48:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 E1F7DE0BA4 for ; Fri, 3 Apr 2020 07:48:23 +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 6CAB034EFA2 for ; Fri, 3 Apr 2020 07:48:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E1AB1BB for ; Fri, 3 Apr 2020 07:48:19 +0000 (UTC) From: "Matt Turner" 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" Message-ID: <1585900065.f96315aee2073ef1d2a52c92c24a05dce4c0e6dc.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: f96315aee2073ef1d2a52c92c24a05dce4c0e6dc X-VCS-Branch: master Date: Fri, 3 Apr 2020 07:48:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5934dcf0-3569-4bc9-b9ed-a83155910829 X-Archives-Hash: d827e02e1fb2dadacb004e2c988ad0f0 commit: f96315aee2073ef1d2a52c92c24a05dce4c0e6dc Author: Matt Turner gentoo org> AuthorDate: Fri Apr 3 04:13:47 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Apr 3 07:47:45 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f96315ae targets: Remove second argument from exec_in_chroot() Signed-off-by: Matt Turner gentoo.org> targets/support/functions.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 88e9ad3b..a256a30c 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -16,20 +16,19 @@ delete_from_chroot(){ fi } -exec_in_chroot(){ # Takes the full path to the source file as its argument # copies the file to the /tmp directory of the chroot # and executes it. +exec_in_chroot() { local file_name=$(basename ${1}) - local subdir=${2} - local destdir="${subdir}/tmp" + local destdir="/tmp" echo "Copying ${file_name} to ${destdir}" copy_to_chroot ${1} ${destdir} copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \ ${destdir} - chroot_path=${clst_chroot_path}${subdir} + chroot_path=${clst_chroot_path} echo "Ensure the file has the executable bit set" chmod +x ${chroot_path}/${destdir}/${file_name}