don't assume ED to exist

svn path=/main/branches/prefix/; revision=14894

diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress
index 4b269d5011533e217a6915c72e4ec8ad8c9cc588..396fc56643c3730b7349202375d4659a741da4f9 100755 (executable)
--- a/bin/ebuild-helpers/ecompress
+++ b/bin/ebuild-helpers/ecompress
@@ -53,10 +53,10 @@ case $1 in
                ;;
        --dequeue)
                [[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
-               find "${ED}" -name '*.ecompress.file' -print0 \
+               find "${D}" -name '*.ecompress.file' -print0 \
                        | sed -e 's:\.ecompress\.file::g' \
                        | ${XARGS} -0 ecompress
-               find "${ED}" -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
+               find "${D}" -name '*.ecompress.file' -print0 | ${XARGS} -0 rm -f
                ;;
        --*)
                vecho "${0##*/}: unknown arguments '$*'" 1>&2

diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 273de957fe160cdf764fde92c75a2f2dea3a5779..301a68fb0a642aef0f31f724586d0d2c03dbb68d 100755 (executable)
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@ -26,10 +26,10 @@ case $1 in
                ;;
        --dequeue)
                [[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2
-               find "${ED}" -name '*.ecompress.dir' -print0 \
+               find "${D}" -name '*.ecompress.dir' -print0 \
                        | sed -e 's:\.ecompress\.dir::g' -e "s:${ED}:/:g" \
                        | ${XARGS} -0 ecompressdir
-               find "${ED}" -name '*.ecompress.skip' -print0 | ${XARGS} -0 rm -f
+               find "${D}" -name '*.ecompress.skip' -print0 | ${XARGS} -0 rm -f
                exit 0
                ;;
        --*)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 4b5902e9c599c27fd754d7b3574113cfdd6cfe0b..f252c14be97c8e3ebb34dfb837121b63dc6a7493 100644 (file)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -1060,7 +1060,7 @@ preinst_aix() {
                archive=${archive#*;}
                archive=${archive%%;*}
                if [[ ${archive} == *'['*']' ]]; then
-                       archive=${archive%"["*}
+                       archive=${archive%[*}
                        [[ ${prev_archive} == ${archive} ]] && continue
                        prev_archive=${archive}
                        archives[${#archives[@]}]=${archive#${EPREFIX}/}
@@ -1137,7 +1137,7 @@ postinst_aix() {
                [[ ${member##*/} == *'['*']' ]] || continue
                contentmember=${member%/*}/.${member##*/}
                activecontentmembers="${activecontentmembers}:(${contentmember}):"
-               archive=${member%"["*}
+               archive=${member%[*}
                [[ ${prev_archive} != ${archive} ]] || continue
                prev_archive=${archive}
                activearchives="${activearchives}:(${archive}):"