Author: radu
Date: Fri Jul 18 22:15:01 2014
New Revision: 1611825

URL: http://svn.apache.org/r1611825
Log:
@trivial: added support for OpenSSL >= 1.0 in prepare_artifact_staging.sh


Modified:
    incubator/devicemap/trunk/prepare_artifact_staging.sh

Modified: incubator/devicemap/trunk/prepare_artifact_staging.sh
URL: 
http://svn.apache.org/viewvc/incubator/devicemap/trunk/prepare_artifact_staging.sh?rev=1611825&r1=1611824&r2=1611825&view=diff
==============================================================================
--- incubator/devicemap/trunk/prepare_artifact_staging.sh (original)
+++ incubator/devicemap/trunk/prepare_artifact_staging.sh Fri Jul 18 22:15:01 
2014
@@ -1,9 +1,9 @@
 #!/bin/sh
 ME=$(basename $0)
 ARTIFACT_PATH="$1"
-if [[ -z "${ARTIFACT_PATH}" ]]; then
- echo "Usage: $ME <ARTIFACT_PATH>"
- exit
+if [ -z "${ARTIFACT_PATH}" ]; then
+    echo "Usage: $ME <ARTIFACT_PATH>"
+    exit
 fi
 
 
@@ -14,7 +14,12 @@ echo "# Generating checksum files       
 echo 
"################################################################################"
 for alg in md5 sha1; do
     echo "$alg: $DIR/$ARTIFACT.$alg"
-    (openssl $alg < $ARTIFACT_PATH) > "$DIR/$ARTIFACT.$alg"
+    checksum="`openssl $alg < $ARTIFACT_PATH`"
+    echo $checksum | grep -s -q "stdin" # OpenSSL >= 1.0 outputs stdin when 
computing a checksum
+    if [ $? -eq 0 ]; then
+        checksum="`echo $checksum | awk '{ print $2 }'`"
+    fi
+    echo $checksum > "$ARTIFACT_PATH.$alg"
 done
 echo
 echo 
"################################################################################"
@@ -22,5 +27,3 @@ echo "# Generating signature file       
 echo 
"################################################################################"
 echo "gpg: $DIR/$ARTIFACT.asc"
 gpg --armor --output "$DIR/$ARTIFACT.asc" --detach-sig "$ARTIFACT_PATH"
-
-


Reply via email to