[gentoo-science] [PATCH 05/10] alternatives-2.eclass: Put commonly used path in local variable

[Reinis Danne]

---
 eclass/alternatives-2.eclass | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
index 98317dd..4366601 100644
--- a/eclass/alternatives-2.eclass
+++ b/eclass/alternatives-2.eclass
@@ -108,16 +108,17 @@ cleanup_old_alternatives_module() {
 
 alternatives-2_pkg_postinst() {
        local a alt provider module_version="20090908"
+       local EAUTO="${EROOT%/}/usr/share/eselect/modules/auto"
        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 "${EAUTO}/${alt}.eselect" \
+                       || "$(source "${EAUTO}/${alt}.eselect" &>/dev/null; 
echo "${VERSION}")" \
                                -ne "${module_version}" ]]; then
-                       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 ${EAUTO} ]]; then
+                               install -d "${EAUTO}" || eerror "Could not 
create eselect modules dir"
                        fi
-                       cat > 
"${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" <<-EOF
+                       cat > "${EAUTO}/${alt}.eselect" <<-EOF
                                # This module was automatically generated by 
alternatives.eclass
                                DESCRIPTION="Alternatives for ${alt}"
                                VERSION="${module_version}"
@@ -139,6 +140,7 @@ alternatives-2_pkg_postinst() {
 
 alternatives-2_pkg_prerm() {
        local a alt provider ignore
+       local EAUTO="${EROOT%/}/usr/share/eselect/modules/auto"
        [[ -n ${REPLACED_BY_ID} ]] || ignore=" --ignore"
        for a in "${ALTERNATIVES_PROVIDED[@]}"; do
                alt="${a%:*}"
@@ -147,9 +149,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 "${EAUTO}/${alt}.eselect"
+                       rm "${EAUTO}/${alt}.eselect" || \
+                               eerror rm "${EAUTO}/${alt}.eselect" failed
                fi
        done
 }
-- 
1.8.5.3