Skip to content

Commit 1f93491

Browse files
committed
Merge #12615: doc: allow for SIGNER containing spaces
e2b2e48 doc: SIGNER can contains space inside now. (Ken Lee) Pull request description: SIGNER can contains space inside now. mentioned in #12527 (comment) Tree-SHA512: 8da1e8146751457c351058c0142fa3d474a338fe7304a31ebed4726202202724aaca94441806458512259238a703601b87961196abc3fdd57b5eb0f062ff0c12
2 parents 9903537 + e2b2e48 commit 1f93491

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

doc/release-process.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ If you're using the automated script (found in [contrib/gitian-build.sh](/contri
6363
Setup Gitian descriptors:
6464

6565
pushd ./bitcoin
66-
export SIGNER=(your Gitian key, ie bluematt, sipa, etc)
66+
export SIGNER="(your Gitian key, ie bluematt, sipa, etc)"
6767
export VERSION=(new version, e.g. 0.8.0)
6868
git fetch
6969
git checkout v${VERSION}
@@ -113,16 +113,16 @@ The gbuild invocations below <b>DO NOT DO THIS</b> by default.
113113

114114
pushd ./gitian-builder
115115
./bin/gbuild --num-make 2 --memory 3000 --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
116-
./bin/gsign --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
116+
./bin/gsign --signer "$SIGNER" --release ${VERSION}-linux --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
117117
mv build/out/bitcoin-*.tar.gz build/out/src/bitcoin-*.tar.gz ../
118118

119119
./bin/gbuild --num-make 2 --memory 3000 --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
120-
./bin/gsign --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
120+
./bin/gsign --signer "$SIGNER" --release ${VERSION}-win-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
121121
mv build/out/bitcoin-*-win-unsigned.tar.gz inputs/bitcoin-win-unsigned.tar.gz
122122
mv build/out/bitcoin-*.zip build/out/bitcoin-*.exe ../
123123

124124
./bin/gbuild --num-make 2 --memory 3000 --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
125-
./bin/gsign --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
125+
./bin/gsign --signer "$SIGNER" --release ${VERSION}-osx-unsigned --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
126126
mv build/out/bitcoin-*-osx-unsigned.tar.gz inputs/bitcoin-osx-unsigned.tar.gz
127127
mv build/out/bitcoin-*.tar.gz build/out/bitcoin-*.dmg ../
128128
popd
@@ -152,9 +152,9 @@ Verify the signatures
152152
Commit your signature to gitian.sigs:
153153

154154
pushd gitian.sigs
155-
git add ${VERSION}-linux/${SIGNER}
156-
git add ${VERSION}-win-unsigned/${SIGNER}
157-
git add ${VERSION}-osx-unsigned/${SIGNER}
155+
git add ${VERSION}-linux/"${SIGNER}"
156+
git add ${VERSION}-win-unsigned/"${SIGNER}"
157+
git add ${VERSION}-osx-unsigned/"${SIGNER}"
158158
git commit -a
159159
git push # Assuming you can push to the gitian.sigs tree
160160
popd
@@ -199,7 +199,7 @@ Create (and optionally verify) the signed OS X binary:
199199

200200
pushd ./gitian-builder
201201
./bin/gbuild -i --commit signature=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
202-
./bin/gsign --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
202+
./bin/gsign --signer "$SIGNER" --release ${VERSION}-osx-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
203203
./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
204204
mv build/out/bitcoin-osx-signed.dmg ../bitcoin-${VERSION}-osx.dmg
205205
popd
@@ -208,7 +208,7 @@ Create (and optionally verify) the signed Windows binaries:
208208

209209
pushd ./gitian-builder
210210
./bin/gbuild -i --commit signature=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
211-
./bin/gsign --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
211+
./bin/gsign --signer "$SIGNER" --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
212212
./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-signed ../bitcoin/contrib/gitian-descriptors/gitian-win-signer.yml
213213
mv build/out/bitcoin-*win64-setup.exe ../bitcoin-${VERSION}-win64-setup.exe
214214
mv build/out/bitcoin-*win32-setup.exe ../bitcoin-${VERSION}-win32-setup.exe
@@ -217,8 +217,8 @@ Create (and optionally verify) the signed Windows binaries:
217217
Commit your signature for the signed OS X/Windows binaries:
218218

219219
pushd gitian.sigs
220-
git add ${VERSION}-osx-signed/${SIGNER}
221-
git add ${VERSION}-win-signed/${SIGNER}
220+
git add ${VERSION}-osx-signed/"${SIGNER}"
221+
git add ${VERSION}-win-signed/"${SIGNER}"
222222
git commit -a
223223
git push # Assuming you can push to the gitian.sigs tree
224224
popd

0 commit comments

Comments
 (0)