[tor-commits] [oonib/master] Detect which command to run for computing sha256 sum.

[art@xxxxxxxxxxxxxx]

commit 4e10fff9cb7a02c4db4704d91aa40b9461eb0301
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Mon Jun 2 12:34:59 2014 +0200

    Detect which command to run for computing sha256 sum.
---
 scripts/build_tor2web_tor.sh |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/build_tor2web_tor.sh b/scripts/build_tor2web_tor.sh
index b510c51..cebc55f 100755
--- a/scripts/build_tor2web_tor.sh
+++ b/scripts/build_tor2web_tor.sh
@@ -19,6 +19,17 @@ https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
 https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.tar.gz.asc
 https://github.com/downloads/libevent/libevent/libevent-$LIBEVENT_VERSION.tar.gz";
 
+if [ command -v shasum ]; then
+  SHA256SUM='shasum -a 256'
+fi
+if [ command -v sha256sum ]; then
+  SHA256SUM='sha256sum'
+fi
+if [ ! $SHA256SUM ]; then
+  echo "Could not find a suitable command for computing sha256 hash!";
+  exit;
+fi
+
 # get key for nickm (libevent)
 gpg --fingerprint 0xb35bf85bf19489d04e28c33c21194ebb165733ea
 if [ $? -ne 0 ]; then 
@@ -70,7 +81,7 @@ cd libevent-$LIBEVENT_VERSION
 
 # set up zlib
 cd $SCRIPT_ROOT
-echo "$ZLIB_SHA256  zlib-$ZLIB_VERSION.tar.gz" | shasum -a 256 -c
+echo "$ZLIB_SHA256  zlib-$ZLIB_VERSION.tar.gz" | $SHA256SUM -c
 if [ $? -ne 0 ]; then exit ;fi
 
 tar xfz zlib-$ZLIB_VERSION.tar.gz



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits