From e3c5adc6d0d42266c24dd9fe25050e463a1d6320 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 18 Dec 2020 01:13:58 +0100 Subject: [PATCH] tools: fix release script sign function PR-URL: https://github.com/nodejs/node/pull/36556 Refs: https://github.com/nodejs/node/pull/36540 Reviewed-By: Beth Griggs Reviewed-By: Richard Lau --- tools/release.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index d327bad73c6f15..bf70eadfbcada0 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -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..." @@ -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