diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-03-05 00:36:44 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-05 00:36:44 +0000 |
| commit | 8d5d9379824ef6c7dab60a7e9226225212a7d6d5 (patch) | |
| tree | 1429e780b7a6ee9c41a6db33f0615460507dbb0b | |
| parent | Avoid pointless population of the binary tree when --buildpkg is enabled. Th... (diff) | |
| download | portage-multirepo-8d5d9379824ef6c7dab60a7e9226225212a7d6d5.tar.gz portage-multirepo-8d5d9379824ef6c7dab60a7e9226225212a7d6d5.tar.bz2 portage-multirepo-8d5d9379824ef6c7dab60a7e9226225212a7d6d5.zip | |
allow people to disable compression by setting the PORTAGE_COMPRESS variables to "" (trunk r6173:6174)
svn path=/main/branches/2.1.2/; revision=6177
| -rwxr-xr-x | bin/ecompress | 12 | ||||
| -rwxr-xr-x | bin/ecompressdir | 14 |
2 files changed, 12 insertions, 14 deletions
diff --git a/bin/ecompress b/bin/ecompress index 2b2fa814..2006f657 100755 --- a/bin/ecompress +++ b/bin/ecompress @@ -3,16 +3,18 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: prepman 5507 2007-01-10 04:22:27Z zmedico $ +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh + if [[ -z $1 ]] ; then - echo "${0##*/}: at least one argument needed" 1>&2 + vecho "${0##*/}: at least one argument needed" 1>&2 exit 1 fi -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh - # setup compression stuff -PORTAGE_COMPRESS=${PORTAGE_COMPRESS:-bzip2} -if [[ -z ${PORTAGE_COMPRESS_FLAGS} ]] ; then +PORTAGE_COMPRESS=${PORTAGE_COMPRESS-bzip2} +[[ -z ${PORTAGE_COMPRESS} ]] && exit 0 + +if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then case ${PORTAGE_COMPRESS} in bzip2|gzip) PORTAGE_COMPRESS_FLAGS="-f9";; esac diff --git a/bin/ecompressdir b/bin/ecompressdir index 163230dd..cad0ce26 100755 --- a/bin/ecompressdir +++ b/bin/ecompressdir @@ -3,19 +3,15 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: prepalldocs 3483 2006-06-10 21:40:40Z genone $ +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh + if [[ -z $1 ]] ; then - echo "${0##*/}: at least one argument needed" 1>&2 + vecho "${0##*/}: at least one argument needed" 1>&2 exit 1 fi # figure out the new suffix suffix=$(ecompress --suffix) -if [[ -z ${suffix} ]] ; then - vecho "${0##*/}: unable to figure out compressed suffix" - exit 1 -fi - -source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh # funk_up_dir(action, suffix, binary) # - action: compress or decompress @@ -54,8 +50,6 @@ for dir in "$@" ; do if [[ ! -d ${dir} ]] ; then vecho "${0##*/}: ${dir#${D}} does not exist!" continue - else - vecho "${0##*/}: $(ecompress --bin) ${dir#${D}}" fi # not uncommon for packages to compress doc files themselves @@ -64,6 +58,8 @@ for dir in "$@" ; do funk_up_dir "decompress" "bz2" "bunzip2" # now lets do our work + [[ -z ${suffix} ]] && continue + vecho "${0##*/}: $(ecompress --bin) ${dir#${D}}" funk_up_dir "compress" "${suffix}" "ecompress" done |