diff -r 859eeb3579b2 -r c6c431cf0a89 self-extract-src.sh
--- a/self-extract-src.sh	Mon Jul 05 14:36:48 2010 -0400
+++ b/self-extract-src.sh	Mon Jul 05 23:29:07 2010 -0400
@@ -10,6 +10,12 @@
   exit 1
 fi
 
+# OS X sed (at least leopard and up) seem to support -E
+sedflags=Ee
+if ( sed --version 2>&1 | grep 'GNU sed' 2>&1 ) > /dev/null ; then
+	sedflags=re
+fi
+
 my_which_real()
 {
   test -n "$1" || return 1
@@ -73,7 +79,7 @@
 }
 
 # Go through each required command, and make sure it's on the system. If not, fail.
-for cmd in bzip2 tar grep tail cat wc dd md5sum; do
+for cmd in bzip2 tar grep tail cat wc dd; do
   my_which $cmd>/dev/null || exit 1
   eval $cmd=`my_which $cmd`
   if test x$? = x1; then
@@ -81,6 +87,21 @@
   fi
 done
 
+# special case for md5sum
+if my_which_real md5sum 2>&1 > /dev/null; then
+	md5sum=`my_which_real md5sum`
+elif my_which_real openssl 2>&1 > /dev/null; then
+	md5sum=md5sum
+	md5sum()
+	{
+		local f=${1:--}
+		cat $f | openssl dgst -md5 | sed -$sedflags 's/^\(stdin\)= //'
+	}
+else
+	echo "Could not find md5sum or openssl"
+	exit 1
+fi
+
 tempdir=""
 extractonly=0
 while test -n "$1"; do
@@ -90,7 +111,7 @@
       if test -n "$2"; then
         tempdir=$2
       else
-        tempdir=`echo $0 | sed -re 's/\.[a-z0-9_-]{1,5}$//'`
+        tempdir=`echo $0 | sed -$sedflags 's/\.[a-z0-9_-]{1,5}$//'`
       fi
       ;;
   esac