adamfeuer commented on a change in pull request #1382: URL: https://github.com/apache/incubator-nuttx/pull/1382#discussion_r452587291
########## File path: tools/checkrelease.sh ########## @@ -19,114 +19,218 @@ # ############################################################################# -set -e - +VERBOSE=0 +RETURN_CODE=0 BASE_URL="https://dist.apache.org/repos/dist/dev/incubator/nuttx"; -TEMPDIR="dist.apache.org" +DIST_DIR="dist.apache.org" +TMP="/tmp" +TEMPDIR="$TMP/nuttx-checkrelease" ORIGINAL_DIR="$(pwd)" trap "{ cd $ORIGINAL_DIR; rm -rf $TEMPDIR; }" EXIT function download_release() { - wget -r -np -R "index.html*" -P . --cut-dirs 7 "$URL" + rm -rf "$TEMPDIR" + if [[ -n "$URL" ]]; then + mkdir "$TEMPDIR" + wget -r --no-parent -P "$TEMPDIR" --cut-dirs 8 "$URL" cd "$TEMPDIR" + mv $DIST_DIR/apache-nuttx-* . + else + if [[ -n "$DIRECTORY" ]]; then + cp -r "$DIRECTORY" "$TEMPDIR" + cd "$TEMPDIR" + else + echo "One of --dir or --url is required!" + exit 1 + fi + fi Review comment: @xiaoxiang781216 I'll try this out to see how it looks— ########## File path: tools/checkrelease.sh ########## @@ -19,114 +19,218 @@ # ############################################################################# -set -e - +VERBOSE=0 +RETURN_CODE=0 BASE_URL="https://dist.apache.org/repos/dist/dev/incubator/nuttx"; -TEMPDIR="dist.apache.org" +DIST_DIR="dist.apache.org" +TMP="/tmp" +TEMPDIR="$TMP/nuttx-checkrelease" ORIGINAL_DIR="$(pwd)" trap "{ cd $ORIGINAL_DIR; rm -rf $TEMPDIR; }" EXIT function download_release() { - wget -r -np -R "index.html*" -P . --cut-dirs 7 "$URL" + rm -rf "$TEMPDIR" + if [[ -n "$URL" ]]; then + mkdir "$TEMPDIR" + wget -r --no-parent -P "$TEMPDIR" --cut-dirs 8 "$URL" cd "$TEMPDIR" + mv $DIST_DIR/apache-nuttx-* . + else + if [[ -n "$DIRECTORY" ]]; then + cp -r "$DIRECTORY" "$TEMPDIR" + cd "$TEMPDIR" + else + echo "One of --dir or --url is required!" + exit 1 + fi + fi } function check_sha512() { - # check release sha512 RELEASE_FILE=$1 echo "Checking $RELEASE_FILE sha512..." - sha512sum -c "$RELEASE_FILE.sha512" + output="$(sha512sum -c $RELEASE_FILE.sha512)" + return_value=$? + if [ $return_value -eq 0 ]; then + echo " OK: $RELEASE_FILE sha512 hash matches." + else + RETURN_CODE=1 + echo " - $RELEASE_FILE sha512 hash does not match:" + echo "$output" + fi + echo } function check_gpg() { - # check nuttx sha512 and gpg RELEASE_FILE=$1 echo "Checking $RELEASE_FILE GPG signature:" - gpg --verify "$RELEASE_FILE.asc" "$RELEASE_FILE" + output="$(gpg --quiet --verify $RELEASE_FILE.asc $RELEASE_FILE 2>&1)" + return_value=$? + if [ $return_value -eq 0 ]; then + echo " OK: $RELEASE_FILE gpg signature matches." + else + RETURN_CODE=1 + echo " - Error checking $RELEASE_FILE gpg signature:" + echo "$output" + echo + fi echo } function check_required_files() { - # check nuttx for required files - RELEASE_FILE=$1 - RELEASE_DIR=$2 - rm -rf "$RELEASE_DIR" - tar xf "$RELEASE_FILE" + RELEASE_DIR=$1 + echo "Checking $RELEASE_FILE for required files:" ERROR=0 Review comment: @xiaoxiang781216 will fix ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
