commit: f96315aee2073ef1d2a52c92c24a05dce4c0e6dc Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Apr 3 04:13:47 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=f96315ae
targets: Remove second argument from exec_in_chroot() Signed-off-by: Matt Turner <mattst88 <AT> 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}