drop the need for the force flag by default and just delete the existing files automa...

svn path=/main/branches/2.1.2/; revision=6295

diff --git a/bin/ecompress b/bin/ecompress
index 59e1e86935fc552165419863353f9a71738a25cd..5e4f645737689efaac89b15a3d634ea05c95603e 100755 (executable)
--- 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