From e4f268b67960ff7326d69fe150cc648c2593e0ab Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 16 Mar 2007 23:38:47 +0000 Subject: drop the need for the force flag by default and just delete the existing files automatically #171007 svn path=/main/trunk/; revision=6219 --- bin/ecompress | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/ecompress b/bin/ecompress index 2006f657b..7e51e3c44 100755 --- a/bin/ecompress +++ b/bin/ecompress @@ -16,7 +16,7 @@ PORTAGE_COMPRESS=${PORTAGE_COMPRESS-bzip2} if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then case ${PORTAGE_COMPRESS} in - bzip2|gzip) PORTAGE_COMPRESS_FLAGS="-f9";; + bzip2|gzip) PORTAGE_COMPRESS_FLAGS="-9";; esac fi @@ -41,6 +41,12 @@ case $1 in echo "${PORTAGE_COMPRESS} ${PORTAGE_COMPRESS_FLAGS}" ;; *) + # If a compressed version of the file already exists, simply + # delete it so that the compressor doesn't whine (bzip2 will + # complain and skip, gzip will prompt for input) + suffix=$(ecompress --suffix) + [[ -n ${suffix} ]] && rm -f "${@/%/${suffix}}" + # Finally, let's actually do some real work exec "${PORTAGE_COMPRESS}" ${PORTAGE_COMPRESS_FLAGS} "$@" ;; esac -- cgit v1.2.3-1-g7c22