Merge pull request #4820

e27e421f Fix version prefix in gitian build (TheCharlatan)

2 files changed, 8 insertions, 21 deletions

diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md
index 4bd326f22..0b13df344 100644
--- a/contrib/gitian/README.md
+++ b/contrib/gitian/README.md
@@ -17,19 +17,6 @@ More independent Gitian builders are needed, which is why this guide exists.
 It is preferred you follow these steps yourself instead of using someone else's
 VM image to avoid 'contaminating' the build.
 
-Table of Contents
-------------------
-
-Please note that these instructions have been forked from bitcoin's gitian build
-instructions. Please also consult their documentation, when running into problems.
-The signing is left as inherited from bitcoin at the moment.
-
-- [Preparing the Gitian builder host](#preparing-the-gitian-builder-host)
-- [Getting and building the inputs](#getting-and-building-the-inputs)
-- [Building Binaries](#building-bitcoin-core)
-- [Signing externally](#signing-externally)
-- [Uploading signatures](#uploading-signatures)
-
 Preparing the Gitian builder host
 ---------------------------------
 
@@ -93,10 +80,10 @@ cp monero/contrib/gitian/gitian-build.py .
 Setup the required environment, you only need to do this once:
 
 ```
-./gitian-build.py --setup fluffypony 0.14.0
+./gitian-build.py --setup fluffypony v0.14.0
 ```
 
-Where `fluffypony` is your Github name and `0.14.0` is the version tag you want to build (without `v`).
+Where `fluffypony` is your Github name and `v0.14.0` is the version tag you want to build.
 
 While gitian and this build script does provide a way for you to sign the build directly, it is recommended to sign in a seperate step. 
 This script is only there for convenience. Seperate steps for building can still be taken.
@@ -113,7 +100,7 @@ Build Binaries
 -----------------------------
 To build the most recent tag:
 
- `./gitian-build.py --detach-sign --no-commit -b fluffypony 0.14.0`
+ `./gitian-build.py --detach-sign --no-commit -b fluffypony v0.14.0`
 
 To speed up the build, use `-j 5 -m 5000` as the first arguments, where `5` is the number of CPU's you allocated to the VM plus one, and 5000 is a little bit less than then the MB's of RAM you allocated. If there is memory corruption on your machine, try to tweak these values.
 
@@ -123,7 +110,7 @@ If you do detached, offline signing, you need to copy these uncommited changes t
 
 ```
 export NAME=fluffypony
-export VERSION=0.14
+export VERSION=v0.14.0
 gpg --output $VERSION-linux/$NAME/monero-linux-$VERSION-build.assert.sig --detach-sign $VERSION-linux/$NAME/monero-linux-$VERSION-build.assert
 gpg --output $VERSION-osx-unsigned/$NAME/monero-osx-$VERSION-build.assert.sig --detach-sign $VERSION-osx-unsigned/$NAME/monero-osx-$VERSION-build.assert
 gpg --output $VERSION-win-unsigned/$NAME/monero-win-$VERSION-build.assert.sig --detach-sign $VERSION-win-unsigned/$NAME/monero-win-$VERSION-build.assert
@@ -133,9 +120,9 @@ Make a pull request (both the `.assert` and `.assert.sig` files) to the
 [monero-project/gitian.sigs](https://github.com/monero-project/gitian.sigs/) repository:
 
 ```
-git checkout -b 0.14.0
-git commit -S -a -m "Add $NAME 0.14.0"
-git push --set-upstream $NAME 0.14.0
+git checkout -b v0.14.0
+git commit -S -a -m "Add $NAME v0.14.0"
+git push --set-upstream $NAME v0.14.0
 ```
 
 ```bash
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 99c64e9dd..df1ba0d6b 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -165,7 +165,7 @@ def main():
     # Add leading 'v' for tags
     if args.commit and args.pull:
         raise Exception('Cannot have both commit and pull')
-    args.commit = ('' if args.commit else) + args.version
+    args.commit = args.commit if args.commit else args.version
 
     if args.setup:
         setup()