| 1 |
commit: 83ae227b9505ab13fbe577fb10e4107da6433405 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 17 20:49:11 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 27 21:41:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ae227b |
| 7 |
|
| 8 |
cdrom.eclass: Use consistent terminology in prompts and messages |
| 9 |
|
| 10 |
eclass/cdrom.eclass | 28 ++++++++++++---------------- |
| 11 |
1 file changed, 12 insertions(+), 16 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass |
| 14 |
index 7d552f91996..5eeb52a0ed0 100644 |
| 15 |
--- a/eclass/cdrom.eclass |
| 16 |
+++ b/eclass/cdrom.eclass |
| 17 |
@@ -58,7 +58,7 @@ cdrom_get_cds() { |
| 18 |
|
| 19 |
# Single disc info. |
| 20 |
elif [[ ${#} -eq 1 ]] ; then |
| 21 |
- einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}" |
| 22 |
+ einfo "This ebuild will need the ${CDROM_NAME:-CD for ${PN}}" |
| 23 |
echo |
| 24 |
einfo "If you do not have the CD, but have the data files" |
| 25 |
einfo "mounted somewhere on your filesystem, just export" |
| 26 |
@@ -72,7 +72,7 @@ cdrom_get_cds() { |
| 27 |
# Multi disc info. |
| 28 |
else |
| 29 |
_cdrom_set_names |
| 30 |
- einfo "This package may need access to ${#} cds." |
| 31 |
+ einfo "This package may need access to ${#} CDs." |
| 32 |
local cdcnt |
| 33 |
for cdcnt in $(seq ${#}); do |
| 34 |
local var=CDROM_NAME_${cdcnt} |
| 35 |
@@ -85,7 +85,7 @@ cdrom_get_cds() { |
| 36 |
einfo $(printf "CD_ROOT_%d " $(seq ${#})) |
| 37 |
echo |
| 38 |
einfo "Or, if you have all the files in the same place, or" |
| 39 |
- einfo "you only have one cdrom, you can export CD_ROOT" |
| 40 |
+ einfo "you only have one CD, you can export CD_ROOT" |
| 41 |
einfo "and that place will be used as the same data source" |
| 42 |
einfo "for all the CDs." |
| 43 |
echo |
| 44 |
@@ -150,31 +150,27 @@ cdrom_load_next_cd() { |
| 45 |
die "unable to locate CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" |
| 46 |
fi |
| 47 |
|
| 48 |
- echo |
| 49 |
if [[ ${showedmsg} -eq 0 ]] ; then |
| 50 |
if [[ ${#CDROM_CHECKS[@]} -eq 1 ]] ; then |
| 51 |
- if [[ -z ${CDROM_NAME} ]] ; then |
| 52 |
- einfo "Please insert+mount the cdrom for ${PN} now !" |
| 53 |
- else |
| 54 |
- einfo "Please insert+mount the ${CDROM_NAME} cdrom now !" |
| 55 |
- fi |
| 56 |
+ einfo "Please insert+mount the ${CDROM_NAME:-CD for ${PN}} now !" |
| 57 |
else |
| 58 |
- if [[ -z ${CDROM_NAME_1} ]] ; then |
| 59 |
- einfo "Please insert+mount cd #${CDROM_CURRENT_CD}" \ |
| 60 |
- "for ${PN} now !" |
| 61 |
+ local var="CDROM_NAME_${CDROM_CURRENT_CD}" |
| 62 |
+ if [[ -z ${!var} ]] ; then |
| 63 |
+ einfo "Please insert+mount CD #${CDROM_CURRENT_CD} for ${PN} now !" |
| 64 |
else |
| 65 |
- local var="CDROM_NAME_${CDROM_CURRENT_CD}" |
| 66 |
- einfo "Please insert+mount the ${!var} cdrom now !" |
| 67 |
+ einfo "Please insert+mount the ${!var} now !" |
| 68 |
fi |
| 69 |
fi |
| 70 |
showedmsg=1 |
| 71 |
fi |
| 72 |
- einfo "Press return to scan for the cd again" |
| 73 |
+ |
| 74 |
+ einfo "Press return to scan for the CD again" |
| 75 |
einfo "or hit CTRL+C to abort the emerge." |
| 76 |
- echo |
| 77 |
+ |
| 78 |
if [[ ${showjolietmsg} -eq 0 ]] ; then |
| 79 |
showjolietmsg=1 |
| 80 |
else |
| 81 |
+ echo |
| 82 |
ewarn "If you are having trouble with the detection" |
| 83 |
ewarn "of your CD, it is possible that you do not have" |
| 84 |
ewarn "Joliet support enabled in your kernel. Please" |
Archives