From: Zac Medico Date: Sat, 24 Nov 2007 18:28:15 +0000 (-0000) Subject: Use `md5` if `md5sum` is not available (useful for FreeBSD users). X-Git-Tag: v2.2_pre1~330 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d5694628eb9d28f5fece8fb152e6931cc84722c;p=portage.git Use `md5` if `md5sum` is not available (useful for FreeBSD users). svn path=/main/trunk/; revision=8643 --- diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index e13e1ea76..2e860453e 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -527,8 +527,16 @@ dyn_package() { rm -f "${PORTAGE_BINPKG_TMPFILE}" die "Failed to append metadata to the tbz2 file" fi - local md5sum_output=$(md5sum "${PORTAGE_BINPKG_TMPFILE}") - echo ${md5sum_output%% *} > "${PORTAGE_BUILDDIR}"/build-info/BINPKGMD5 + local md5_hash="" + if type md5sum &>/dev/null ; then + md5_hash=$(md5sum "${PORTAGE_BINPKG_TMPFILE}") + md5_hash=${md5_hash%% *} + elif type md5 &>/dev/null ; then + md5_hash=$(md5 "${PORTAGE_BINPKG_TMPFILE}") + md5_hash=${md5_hash##* } + fi + [ -n "${md5_hash}" ] && \ + echo ${md5_hash} > "${PORTAGE_BUILDDIR}"/build-info/BINPKGMD5 vecho ">>> Done." cd "${PORTAGE_BUILDDIR}" touch .packaged || die "Failed to 'touch .packaged' in ${PORTAGE_BUILDDIR}"