Skip to content

Commit

Permalink
tools: fix release script sign function
Browse files Browse the repository at this point in the history
PR-URL: #36556
Refs: #36540
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
  • Loading branch information
aduh95 authored and targos committed Dec 21, 2020
1 parent c5602fb commit e3c5adc
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions tools/release.sh
Expand Up @@ -103,9 +103,9 @@ sign() {
# shellcheck disable=SC2086,SC2029
shapath=$(ssh ${customsshkey} "${webuser}@${webhost}" $signcmd nodejs $1)

echo "${shapath}" | grep -q '^/.*/SHASUMS256.txt$' || \
echo 'Error: No SHASUMS file returned by sign!' \
exit 1
echo "${shapath}" | grep -q '^/.*/SHASUMS256.txt$' || (\
echo 'Error: No SHASUMS file returned by sign!' &&\
exit 1)

echo ""
echo "# Signing SHASUMS for $1..."
Expand Down Expand Up @@ -141,7 +141,8 @@ sign() {
fi

if [ "X${yorn}" = "Xy" ]; then
scp "${customsshkey}" "${tmpdir}/${shafile}" "${tmpdir}/${shafile}.asc" "${tmpdir}/${shafile}.sig" "${webuser}@${webhost}:${shadir}/"
# shellcheck disable=SC2086
scp ${customsshkey} "${tmpdir}/${shafile}" "${tmpdir}/${shafile}.asc" "${tmpdir}/${shafile}.sig" "${webuser}@${webhost}:${shadir}/"
# shellcheck disable=SC2086,SC2029
ssh ${customsshkey} "${webuser}@${webhost}" chmod 644 "${shadir}/${shafile}.asc" "${shadir}/${shafile}.sig"
break
Expand Down

0 comments on commit e3c5adc

Please sign in to comment.