From 572be2d7c2557cd89f30aff6c4efd6503894a14e Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Thu, 3 May 2018 03:21:34 +0200
Subject: [PATCH] =?UTF-8?q?Misc=20fixes=20=C3=A9=5F=C3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/build_deb | 4 +++-
 ynh-build         | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/build_deb b/scripts/build_deb
index 8f598ea..2ad767d 100755
--- a/scripts/build_deb
+++ b/scripts/build_deb
@@ -33,7 +33,7 @@ EOF
 
 function main()
 {
-    validate_argument
+    validate_arguments
     retrieve_package_info
     build_sources
     add_to_reprepro
@@ -87,6 +87,7 @@ function retrieve_package_info()
 
 function build_sources()
 {
+    echo "---------------------------------------------------"
     echo "Building source package of ${PACKAGE}_${VERSION}..."
     echo "---------------------------------------------------"
 
@@ -100,6 +101,7 @@ function build_sources()
 
 function add_to_reprepro()
 {
+    echo "---------------------------------------------------"
     echo "Adding ${PACKAGE}_${VERSION} to ${DISTRIB}/${BRANCH}..."
     echo "---------------------------------------------------"
     $INCLUDE_CHANGES $DISTRIB $BRANCH $CHANGES_FILE
diff --git a/ynh-build b/ynh-build
index 7596024..d00a03b 100755
--- a/ynh-build
+++ b/ynh-build
@@ -5,7 +5,7 @@ readonly PROJECT=$1
 readonly BRANCH=$2
 readonly DISTRIB=$3
 readonly VERSION=$4
-readonly TAG="debian/$VERSION"
+readonly TAG=$(echo "debian/$VERSION" | tr '~' '-')
 
 source /home/vinaigrette/config/config
 
@@ -76,8 +76,7 @@ function checkout_tag()
     git fetch --quiet
     git fetch --tags --quiet
     git checkout $DISTRIB-$BRANCH --quiet
-    #git checkout $BRANCH --quiet
-    #git pull origin $BRANCH --quiet
+    git reset --hard origin/$DISTRIB-$BRANCH --quiet
 
     LASTVERSIONCHANGELOG=$(dpkg-parsechangelog -S Version 2>/dev/null)