From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C64E9198005 for ; Wed, 27 Feb 2013 09:29:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7CF8E07F7; Wed, 27 Feb 2013 09:29:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C329E07F7 for ; Wed, 27 Feb 2013 09:29:23 +0000 (UTC) Received: from [192.168.1.210] (unknown [24.86.176.233]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id DD8FD33DBC4 for ; Wed, 27 Feb 2013 09:29:21 +0000 (UTC) Message-ID: <1361957340.20292.18.camel@big_daddy.dol-sen.ca> Subject: [gentoo-catalyst] [patch] Fix a relative path bug From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Date: Wed, 27 Feb 2013 01:29:00 -0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.6.3 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Archives-Salt: a152568f-fe57-4e86-a68f-ba2c19de2635 X-Archives-Hash: 3bf2ba9e4d1a3d87859bc52c8464d9f8 Another bug in master that should be fixed. This one should apply cleanly to master. ================================================================= diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 6bfa3a2..79fe08a 100755 @@ -1,5 +1,6 @@ copy_to_chroot() { local src_file=$1 + # needed the above tmp_2 in order to trim the leading / next if it has one local dest_dir=${clst_chroot_path}${2:-/tmp} mkdir -p ${dest_dir} echo "--- Copying ${src_file##*/} to ${dest_dir}" @@ -20,7 +21,7 @@ exec_in_chroot(){ # and executes it. local file_name=$(basename ${1}) local subdir=${2} - local destdir=".${subdir}/tmp" + local destdir="${subdir}/tmp" echo "--- Copying ${file_name} to ${destdir}" copy_to_chroot ${1} ${destdir} @@ -33,7 +34,7 @@ exec_in_chroot(){ chmod +x ${chroot_path}/${destdir}/${file_name} echo "--- Running ${file_name} in chroot ${chroot_path}" - ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1 + ${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1 delete_from_chroot ${destdir}/${file_name} delete_from_chroot ${destdir}/chroot-functions.sh -- Brian Dolbec