[FFmpeg-cvslog] fate: fix md5sum replacement on some systems
Mans Rullgard
git at videolan.org
Wed May 30 19:37:29 CEST 2012
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed May 30 03:31:16 2012 +0100| [00c78a0a151ce6a0c277c1d6736517759ae77aae] | committer: Mans Rullgard
fate: fix md5sum replacement on some systems
On systems where the 'md5' command is used, there is a conflict
with the md5() shell function in fate-run.sh. Using the 'command'
keyword bypasses the shell function for correct behaviour.
Signed-off-by: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00c78a0a151ce6a0c277c1d6736517759ae77aae
---
tests/md5.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/md5.sh b/tests/md5.sh
index 16b0281..4b95127 100644
--- a/tests/md5.sh
+++ b/tests/md5.sh
@@ -2,8 +2,8 @@
if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then
do_md5sum() { md5sum -b $1; }
-elif [ X"$(echo | md5 2> /dev/null)" != X ]; then
- do_md5sum() { md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; }
+elif [ X"$(echo | command md5 2> /dev/null)" != X ]; then
+ do_md5sum() { command md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; }
elif [ -x /sbin/md5 ]; then
do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }
elif openssl version >/dev/null 2>&1; then
More information about the ffmpeg-cvslog
mailing list