[CalendarServer-changes] [14528] CalendarServer/trunk/bin/_build.sh

[source_changes at macosforge.org]

Revision: 14528
          http://trac.calendarserver.org//changeset/14528
Author:   dre at apple.com
Date:     2015-03-07 19:38:42 -0800 (Sat, 07 Mar 2015)
Log Message:
-----------
Fix TWEXT_PKG_CACHE on platforms where 'openssl dgst -md5' prepends '(stdin) ' to the output

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2015-03-07 17:13:26 UTC (rev 14527)
+++ CalendarServer/trunk/bin/_build.sh	2015-03-08 03:38:42 UTC (rev 14528)
@@ -123,7 +123,8 @@
 
   if find_cmd openssl > /dev/null; then
     if [ -z "${hash}" ]; then hash="md5"; fi;
-    md5 () { "$(find_cmd openssl)" dgst -md5 "$@"; }
+    # remove "(stdin)= " from the front which openssl emits on some platforms
+    md5 () { "$(find_cmd openssl)" dgst -md5 "$@" | sed 's/^.* //'; }
   elif find_cmd md5 > /dev/null; then
     if [ -z "${hash}" ]; then hash="md5"; fi;
     md5 () { "$(find_cmd md5)" "$@"; }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150307/75e41149/attachment.html>