Merge pull request #1127 from psgreco/master-fix-guix-gitian

Fix tarball names in guix and gitian builds

contrib/gitian-descriptors/assign_DISTNAME

@@ -5,6 +5,7 @@
 # A helper script to be sourced into the gitian descriptors
 
 if RECENT_TAG="$(git describe --exact-match HEAD 2> /dev/null)"; then
+    RECENT_TAG="${RECENT_TAG#elements-}"
     VERSION="${RECENT_TAG#v}"
 else
     VERSION="$(git rev-parse --short=12 HEAD)"

contrib/guix/libexec/prelude.bash

@@ -50,7 +50,7 @@ fi
 ################
 
 VERSION="${VERSION:-$(git_head_version)}"
-DISTNAME="${DISTNAME:-bitcoin-${VERSION}}"
+DISTNAME="${DISTNAME:-elements-${VERSION}}"
 
 version_base_prefix="${PWD}/guix-build-"
 VERSION_BASE="${version_base_prefix}${VERSION}"  # TOP

contrib/shell/git-utils.bash

@@ -7,6 +7,7 @@ git_root() {
 git_head_version() {
     local recent_tag
     if recent_tag="$(git describe --exact-match HEAD 2> /dev/null)"; then
+        recent_tag="${recent_tag#elements-}"
         echo "${recent_tag#v}"
     else
         git rev-parse --short=12 HEAD