| 1 |
--- |
| 2 |
eclass/alternatives-2.eclass | 18 ++++++++++-------- |
| 3 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 4 |
|
| 5 |
diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass |
| 6 |
index 98317dd..4366601 100644 |
| 7 |
--- a/eclass/alternatives-2.eclass |
| 8 |
+++ b/eclass/alternatives-2.eclass |
| 9 |
@@ -108,16 +108,17 @@ cleanup_old_alternatives_module() { |
| 10 |
|
| 11 |
alternatives-2_pkg_postinst() { |
| 12 |
local a alt provider module_version="20090908" |
| 13 |
+ local EAUTO="${EROOT%/}/usr/share/eselect/modules/auto" |
| 14 |
for a in "${ALTERNATIVES_PROVIDED[@]}"; do |
| 15 |
alt="${a%:*}" |
| 16 |
provider="${a#*:}" |
| 17 |
- if [[ ! -f "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" \ |
| 18 |
- || "$(source "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \ |
| 19 |
+ if [[ ! -f "${EAUTO}/${alt}.eselect" \ |
| 20 |
+ || "$(source "${EAUTO}/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \ |
| 21 |
-ne "${module_version}" ]]; then |
| 22 |
- if [[ ! -d ${EROOT%/}/usr/share/eselect/modules/auto ]]; then |
| 23 |
- install -d "${EROOT%/}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir" |
| 24 |
+ if [[ ! -d ${EAUTO} ]]; then |
| 25 |
+ install -d "${EAUTO}" || eerror "Could not create eselect modules dir" |
| 26 |
fi |
| 27 |
- cat > "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" <<-EOF |
| 28 |
+ cat > "${EAUTO}/${alt}.eselect" <<-EOF |
| 29 |
# This module was automatically generated by alternatives.eclass |
| 30 |
DESCRIPTION="Alternatives for ${alt}" |
| 31 |
VERSION="${module_version}" |
| 32 |
@@ -139,6 +140,7 @@ alternatives-2_pkg_postinst() { |
| 33 |
|
| 34 |
alternatives-2_pkg_prerm() { |
| 35 |
local a alt provider ignore |
| 36 |
+ local EAUTO="${EROOT%/}/usr/share/eselect/modules/auto" |
| 37 |
[[ -n ${REPLACED_BY_ID} ]] || ignore=" --ignore" |
| 38 |
for a in "${ALTERNATIVES_PROVIDED[@]}"; do |
| 39 |
alt="${a%:*}" |
| 40 |
@@ -147,9 +149,9 @@ alternatives-2_pkg_prerm() { |
| 41 |
einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)" |
| 42 |
if [[ $? -eq 2 ]]; then |
| 43 |
einfo "Cleaning up unused alternatives module for ${alt}" |
| 44 |
- echo rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" |
| 45 |
- rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" || |
| 46 |
- eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed |
| 47 |
+ echo rm "${EAUTO}/${alt}.eselect" |
| 48 |
+ rm "${EAUTO}/${alt}.eselect" || \ |
| 49 |
+ eerror rm "${EAUTO}/${alt}.eselect" failed |
| 50 |
fi |
| 51 |
done |
| 52 |
} |
| 53 |
-- |
| 54 |
1.8.5.3 |
Archives