[ooo-build-commit] .: fetch_tarballs.sh

Thomas Klausner tklausner at kemper.freedesktop.org
Fri Oct 1 13:59:42 PDT 2010


 fetch_tarballs.sh |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 22de7b431bb8a0d2a318b92ae01ff5c933c3c089
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Fri Oct 1 22:58:49 2010 +0200

    If choosing the "md5" executable, check if it supports -r or (new) -n.
    
    FreeBSD uses -r, NetBSD -n for the same result.

diff --git a/fetch_tarballs.sh b/fetch_tarballs.sh
index f3fe683..5a866ac 100755
--- a/fetch_tarballs.sh
+++ b/fetch_tarballs.sh
@@ -94,7 +94,11 @@ for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/b
 done
 
 if [ "$md5sum" = "md5" ]; then
-    md5special=-r
+    if md5 -r < /dev/null > /dev/null 2>/dev/null; then
+        md5special=-r
+    elif md5 -n < /dev/null > /dev/null 2>/dev/null; then
+        md5special=-n
+    fi
 fi
 
 if [ -z "$md5sum" ]; then


More information about the ooo-build-commit mailing list