Repository: tinkerpop Updated Branches: refs/heads/tp33 2d39f9b80 -> 4e3a0a9bc
CTR: Some necessary changes in the release validation script to make it work on all systems. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2f8f74a7 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2f8f74a7 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2f8f74a7 Branch: refs/heads/tp33 Commit: 2f8f74a780356850cb6cb0ef6ac96e4a024a6d41 Parents: fde136b Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Tue May 8 12:43:11 2018 -0700 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Tue May 8 12:43:11 2018 -0700 ---------------------------------------------------------------------- bin/validate-distribution.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2f8f74a7/bin/validate-distribution.sh ---------------------------------------------------------------------- diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh index 76e0974..3622905 100755 --- a/bin/validate-distribution.sh +++ b/bin/validate-distribution.sh @@ -22,11 +22,7 @@ # artifacts. You must have gpg installed and must import the # published KEYS file in order for that aspect of the validation # to pass. -# -# curl -L -O https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS -# gpg --import KEYS -COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | grep -Po '(?<=<)[^<]*(?=@apache.org>)' | uniq) TMP_DIR="/tmp/tpdv" # Required. Only the latest version on each release stream is available on dist. @@ -73,6 +69,9 @@ mkdir -p ${TMP_DIR} rm -rf ${TMP_DIR}/* cd ${TMP_DIR} +COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | tee ${TMP_DIR}/KEYS | grep -Po '(?<=<)[^<]*(?=@apache.org>)' | uniq) +gpg --import ${TMP_DIR}/KEYS 2> /dev/null && rm ${TMP_DIR}/KEYS + curl -Ls https://people.apache.org/keys/committer/ | grep -v invalid > ${TMP_DIR}/.committers # validate downloads @@ -97,7 +96,7 @@ echo "OK" echo "* validating signatures and checksums ... " echo -n " * PGP signature ... " -gpg --verify ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1 +gpg --verify --with-fingerprint ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1 verified=0 @@ -117,11 +116,11 @@ done [ ${verified} -eq 1 ] || { echo "failed"; exit 1; } echo "OK" -echo -n " * MD5 checksum ... " -EXPECTED=`cat ${ZIP_FILENAME}.md5` -ACTUAL=`md5sum ${ZIP_FILENAME} | awk '{print $1}'` -[ "$ACTUAL" = "${EXPECTED}" ] || { echo "failed"; exit 1; } -echo "OK" +#echo -n " * MD5 checksum ... " +#EXPECTED=`cat ${ZIP_FILENAME}.md5` +#ACTUAL=`md5sum ${ZIP_FILENAME} | awk '{print $1}'` +#[ "$ACTUAL" = "${EXPECTED}" ] || { echo "failed"; exit 1; } +#echo "OK" echo -n " * SHA1 checksum ... " EXPECTED=`cat ${ZIP_FILENAME}.sha1`