| 1 |
commit: c89c79c68411a2c4b097e27833c3af3db2d7d6e9 |
| 2 |
Author: Reinis Danne <rei4dan <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Jan 20 16:24:45 2014 +0000 |
| 4 |
Commit: Reinis Danne <rei4dan <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jan 21 19:55:20 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c89c79c6 |
| 7 |
|
| 8 |
alternatives-2.eclass: Put commonly used path in local variable |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/alternatives-2.eclass | 16 +++++++++------- |
| 12 |
1 file changed, 9 insertions(+), 7 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass |
| 15 |
index dd16f6a..b053de9 100644 |
| 16 |
--- a/eclass/alternatives-2.eclass |
| 17 |
+++ b/eclass/alternatives-2.eclass |
| 18 |
@@ -108,16 +108,17 @@ cleanup_old_alternatives_module() { |
| 19 |
|
| 20 |
alternatives-2_pkg_postinst() { |
| 21 |
local a alt provider module_version="20090908" |
| 22 |
+ local EAUTO="${EROOT%/}/usr/share/eselect/modules/auto" |
| 23 |
for a in "${ALTERNATIVES_PROVIDED[@]}"; do |
| 24 |
alt="${a%:*}" |
| 25 |
provider="${a#*:}" |
| 26 |
- if [[ ! -f "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" \ |
| 27 |
- || "$(source "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \ |
| 28 |
+ if [[ ! -f "${EAUTO}/${alt}.eselect" \ |
| 29 |
+ || "$(source "${EAUTO}/${alt}.eselect" &>/dev/null; echo "${VERSION}")" \ |
| 30 |
-ne "${module_version}" ]]; then |
| 31 |
- if [[ ! -d ${EROOT%/}/usr/share/eselect/modules/auto ]]; then |
| 32 |
- install -d "${EROOT%/}"/usr/share/eselect/modules/auto || eerror "Could not create eselect modules dir" |
| 33 |
+ if [[ ! -d ${EAUTO} ]]; then |
| 34 |
+ install -d "${EAUTO}" || eerror "Could not create eselect modules dir" |
| 35 |
fi |
| 36 |
- cat > "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" <<-EOF |
| 37 |
+ cat > "${EAUTO}/${alt}.eselect" <<-EOF |
| 38 |
# This module was automatically generated by alternatives.eclass |
| 39 |
DESCRIPTION="Alternatives for ${alt}" |
| 40 |
VERSION="${module_version}" |
| 41 |
@@ -139,6 +140,7 @@ alternatives-2_pkg_postinst() { |
| 42 |
|
| 43 |
alternatives-2_pkg_prerm() { |
| 44 |
local a alt provider ignore |
| 45 |
+ local EAUTO="${EROOT%/}/usr/share/eselect/modules/auto" |
| 46 |
[[ -n ${REPLACED_BY_ID} ]] || ignore=" --ignore" |
| 47 |
for a in "${ALTERNATIVES_PROVIDED[@]}"; do |
| 48 |
alt="${a%:*}" |
| 49 |
@@ -149,8 +151,8 @@ alternatives-2_pkg_prerm() { |
| 50 |
0) : ;; |
| 51 |
2) |
| 52 |
einfo "Cleaning up unused alternatives module for ${alt}" |
| 53 |
- rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" || \ |
| 54 |
- eerror rm "${EROOT%/}/usr/share/eselect/modules/auto/${alt}.eselect" failed |
| 55 |
+ rm "${EAUTO}/${alt}.eselect" || \ |
| 56 |
+ eerror rm "${EAUTO}/${alt}.eselect" failed |
| 57 |
;; |
| 58 |
*) |
| 59 |
eerror eselect "${alt}" update "${provider}" returned $? |
Archives