1 |
--- |
2 |
eclass/cdrom.eclass | 11 +++-------- |
3 |
1 file changed, 3 insertions(+), 8 deletions(-) |
4 |
|
5 |
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass |
6 |
index 56032e084d01..10a19551161a 100644 |
7 |
--- a/eclass/cdrom.eclass |
8 |
+++ b/eclass/cdrom.eclass |
9 |
@@ -52,12 +52,8 @@ cdrom_get_cds() { |
10 |
# the # of files they gave us |
11 |
local cdcnt=0 |
12 |
local f= |
13 |
- for f in "$@" ; do |
14 |
- ((++cdcnt)) |
15 |
- export CDROM_CHECK_${cdcnt}="$f" |
16 |
- done |
17 |
export CDROM_TOTAL_CDS=${cdcnt} |
18 |
- export CDROM_CURRENT_CD=1 |
19 |
+ export CDROM_CURRENT_CD=1 CDROM_CHECKS=( "${@}" ) |
20 |
|
21 |
# now we see if the user gave use CD_ROOT ... |
22 |
# if they did, let's just believe them that it's correct |
23 |
@@ -80,7 +76,7 @@ cdrom_get_cds() { |
24 |
einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" |
25 |
export CDROM_SET=-1 |
26 |
IFS=: |
27 |
- for f in ${CDROM_CHECK_1} ; do |
28 |
+ for f in ${CDROM_CHECKS[0]} ; do |
29 |
unset IFS |
30 |
((++CDROM_SET)) |
31 |
export CDROM_MATCH=$(_cdrom_glob_match "${CDROM_ROOT}" "${f}") |
32 |
@@ -149,8 +145,7 @@ cdrom_load_next_cd() { |
33 |
var=CD_ROOT_${CDROM_CURRENT_CD} |
34 |
[[ -z ${!var} ]] && var="CD_ROOT" |
35 |
if [[ -z ${!var} ]] ; then |
36 |
- var="CDROM_CHECK_${CDROM_CURRENT_CD}" |
37 |
- _cdrom_locate_file_on_cd ${!var} |
38 |
+ _cdrom_locate_file_on_cd "${CDROM_CHECKS[${CDROM_CURRENT_CD}]}" |
39 |
else |
40 |
export CDROM_ROOT=${!var} |
41 |
fi |
42 |
-- |
43 |
2.11.0 |