[gentoo-commits] proj/sci:master commit in: eclass/

["Denis Dupeyron" <calchan@gentoo.org>]

commit:     68b75e8da7291f48da953d94b7dfdfbd56cdc857
Author:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 16:31:30 2013 +0000
Commit:     Denis Dupeyron <calchan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 16:31:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=68b75e8d

Fix probable trailing / in EROOT

---
 eclass/alternatives-2.eclass |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
index 16caa51..7908fe2 100644
--- a/eclass/alternatives-2.eclass
+++ b/eclass/alternatives-2.eclass
@@ -95,7 +95,7 @@ alternatives_for() {
 }
 
 cleanup_old_alternatives_module() {
-	local alt=${1} old_module="${EROOT}/usr/share/eselect/modules/${alt}.eselect"
+	local alt=${1} old_module="${EROOT%/}/usr/share/eselect/modules/${alt}.eselect"
 	if [[ -f "${old_module}" && "$(source "${old_module}" &>/dev/null; echo "${ALTERNATIVE}")" == "${alt}" ]]; then
 		local version="$(source "${old_module}" &>/dev/null; echo "${VERSION}")"
 		if [[ "${version}" == "0.1" || "${version}" == "20080924" ]]; then
@@ -110,14 +110,14 @@ alternatives-2_pkg_postinst() {
 	for a in "${ALTERNATIVES_PROVIDED[@]}"; do
 		alt="${a%:*}"
 		provider="${a#*:}"
-		if [[ ! -f "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" \
-			|| "$(source "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \
+		if [[ ! -f "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" \
+			|| "$(source "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \
 				-ne "${module_version}" ]]; then
 			#einfo "Creating alternatives module for ${alt}"
-			if [[ ! -d ${EROOT}/usr/share/eselect/modules/auto ]]; then
-				install -d "${EROOT}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir"
+			if [[ ! -d ${EROOT%/}/usr/share/eselect/modules/auto ]]; then
+				install -d "${EROOT%/}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir"
 			fi
-			cat > "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" <<-EOF
+			cat > "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" <<-EOF
 				# This module was automatically generated by alternatives.eclass
 				DESCRIPTION="Alternatives for ${alt}"
 				VERSION="${module_version}"
@@ -150,9 +150,9 @@ alternatives-2_pkg_prerm() {
 		einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
 		if [[ $? -eq 2 ]]; then
 			einfo "Cleaning up unused alternatives module for ${alt}"
-			echo rm "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect"
-			rm "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" ||
-				eerror rm "${EROOT}/usr/share/eselect/modules/auto/${alt}.eselect" failed
+			echo rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect"
+			rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" ||
+				eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed
 		fi
 	done
 }