Gentoo Archives: gentoo-science

From: Reinis Danne <rei4dan@×××××.com>
To: gentoo-science@l.g.o
Subject: [gentoo-science] [PATCH 10/10] alternatives-2.eclass: Use consistent quoting
Date: Mon, 20 Jan 2014 17:55:05
Message-Id: 1390240392-12173-11-git-send-email-rei4dan@gmail.com
In Reply to: [gentoo-science] [PATCH 00/10] alternatives-2.eclass updates by Reinis Danne
1 ---
2 eclass/alternatives-2.eclass | 6 +++---
3 1 file changed, 3 insertions(+), 3 deletions(-)
4
5 diff --git a/eclass/alternatives-2.eclass b/eclass/alternatives-2.eclass
6 index d9896f1..9b1d8b2 100644
7 --- a/eclass/alternatives-2.eclass
8 +++ b/eclass/alternatives-2.eclass
9 @@ -141,7 +141,7 @@ cleanup_old_alternatives_module() {
10 if [[ -f "${old_module}" && "$(source "${old_module}" &>/dev/null; echo "${ALTERNATIVE}")" == "${alt}" ]]; then
11 local version="$(source "${old_module}" &>/dev/null; echo "${VERSION}")"
12 if [[ "${version}" == "0.1" || "${version}" == "20080924" ]]; then
13 - echo rm "${old_module}"
14 + echo "rm ${old_module}"
15 rm "${old_module}" || eerror "rm ${old_module} failed"
16 fi
17 fi
18 @@ -200,9 +200,9 @@ alternatives-2_pkg_prerm() {
19 einfo "Removed ${provider} alternative module for ${alt}, current is $(eselect ${alt} show)"
20 if [[ $? -eq 2 ]]; then
21 einfo "Cleaning up unused alternatives module for ${alt}"
22 - echo rm "${EAUTO}/${alt}.eselect"
23 + echo "rm ${EAUTO}/${alt}.eselect"
24 rm "${EAUTO}/${alt}.eselect" || \
25 - eerror rm "${EAUTO}/${alt}.eselect" failed
26 + eerror "rm ${EAUTO}/${alt}.eselect failed"
27 fi
28 done
29 }
30 --
31 1.8.5.3