diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-12-09 16:16:44 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-12-09 16:16:51 +0100 |
commit | ac09180128a1d2c7d198fa1e08095a46f54831f9 (patch) | |
tree | 92309de9feca17f80ef2ab276d72a2f50d829495 | |
parent | 05c23488c2ce6f415ced607dca7e74a27e0200b5 (diff) | |
parent | c966ff14c77870378847b9e6063b9671739ddc1f (diff) | |
download | bitcoin-ac09180128a1d2c7d198fa1e08095a46f54831f9.tar.xz |
Merge #17680: gitian: fixed SC2001 regex
c966ff14c77870378847b9e6063b9671739ddc1f gitian: fixed SC2001 regex (willyk)
Pull request description:
Currently the gitian-win-signer.yml produces OUTFILE names without `-unsigned` stripped out
This is due to regex having an`%` in front of it
```
$ INFILE="bitcoin-0.19.0-win64-setup-unsigned.exe"
$ echo "${INFILE/%-unsigned}"
bitcoin-0.19.0-win64-setup-unsigned.exe
$ echo "${INFILE/-unsigned}"
bitcoin-0.19.0-win64-setup.exe
```
Fixes #17361
ACKs for top commit:
laanwj:
ACK c966ff14c77870378847b9e6063b9671739ddc1f
hebasto:
ACK c966ff14c77870378847b9e6063b9671739ddc1f
Tree-SHA512: 954547f9dfa4cab4def5f284d4837c21f0e6fed7454a04e83e6b1b7d3fd3f9661ea657047f0d8162f6591909d32ef2f72e801b2f3a44cbb1131ac344cb913a69
-rw-r--r-- | contrib/gitian-descriptors/gitian-win-signer.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 6a52db1f9f..70b7bb111d 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -36,6 +36,6 @@ script: | make find ${UNSIGNED_DIR} -name "*-unsigned.exe" | while read i; do INFILE="$(basename "${i}")" - OUTFILE="${INFILE/%-unsigned}" + OUTFILE="${INFILE/-unsigned}" ./osslsigncode attach-signature -in "${i}" -out "${OUTDIR}/${OUTFILE}" -sigin "${SIGDIR}/${INFILE}.pem" done |