[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

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