Skip to content

Commit 4465008

Browse files
committed
fixup! squash! move back to nodejs.keys
1 parent daac274 commit 4465008

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed
File renamed without changes.

update-keys.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ TMP_DIR=$(mktemp -d)
55
trap 'rm -r "$TMP_DIR"; trap - EXIT; exit' EXIT INT HUP
66
(cd "$TMP_DIR" && curl -fsSO "$KEYRING_URL" && sha256sum pubring.kbx) > keys/nodejs.shasum
77

8-
gpg --no-default-keyring --keyring "$TMP_DIR/pubring.kbx" --list-keys --with-colons | awk -F: '{ if ($1=="fpr") print $10 }' > keys/nodejs.keys
8+
gpg --no-default-keyring --keyring "$TMP_DIR/pubring.kbx" --list-keys --with-colons | awk -F: '{ if ($1=="fpr") print $10 }' > keys/node.keys
99
echo "$KEYRING_URL" > keys/nodejs.url

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ function update_node_version() {
133133
sed -i \
134134
-e "s#\${NODEJS_KEYRING_URL}#$(< keys/nodejs.url)#" \
135135
-e "s/\${NODEJS_KEYRING_HASH}/$(< keys/nodejs.shasum)/" \
136-
-e "s/\${NODEJS_KEYRING_EXPECTED_CONTENT}/\$(printf '$(sed ':a;N;$!ba;s/\n/\\\\n/g' keys/nodejs.keys)\\\\n')/" \
136+
-e "s/\${NODEJS_KEYRING_EXPECTED_CONTENT}/\$(printf '$(sed ':a;N;$!ba;s/\n/\\\\n/g' keys/node.keys)\\\\n')/" \
137137
"${dockerfile}-tmp"
138138

139139
if is_alpine "${variant}"; then

0 commit comments

Comments
 (0)