From c9f35fb0c042ea3362c5a2da479068fd982313b1 Mon Sep 17 00:00:00 2001
From: Alejandro R Mosteo <alejandro@mosteo.com>
Date: Mon, 27 Sep 2021 17:49:09 +0200
Subject: [PATCH] Fix folder entering for versions with -pre or -build (#372)

* Fix folder change for versions with -pre or -build

* Touch the hello crate
---
 index/he/hello/hello-1.0.1.toml |  2 +-
 scripts/gh-build-crate.sh       | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/index/he/hello/hello-1.0.1.toml b/index/he/hello/hello-1.0.1.toml
index 2adfc377..f6105673 100644
--- a/index/he/hello/hello-1.0.1.toml
+++ b/index/he/hello/hello-1.0.1.toml
@@ -1,4 +1,4 @@
-description = "\"Hello, world!\" demonstration project"
+description = '"Hello, world!" demonstration project'
 name = "hello"
 version = "1.0.1"
 
diff --git a/scripts/gh-build-crate.sh b/scripts/gh-build-crate.sh
index ad24cbcf..ff7a6ddf 100755
--- a/scripts/gh-build-crate.sh
+++ b/scripts/gh-build-crate.sh
@@ -28,7 +28,7 @@ alr index --name local --add ./index
 # Test crate
 for file in $CHANGES; do
 
-   if [[ $file == index.toml ]]; then 
+   if [[ $file == index.toml ]]; then
       echo Skipping index metadata file: $file
       continue
    fi
@@ -48,6 +48,7 @@ for file in $CHANGES; do
 
    crate=$(basename $file .toml | cut -f1 -d-)
    version=$(basename $file .toml | cut -f2- -d-)
+   version_noextras=$(echo $version | cut -f1 -d- | cut -f1 -d+)
    milestone="$crate=$version"
    echo Testing crate: $milestone
    # Remember that version can be "external", in which case we do not know the
@@ -89,7 +90,7 @@ for file in $CHANGES; do
       continue
    fi
 
-   # Update system repositories whenever a detected system package is involved, 
+   # Update system repositories whenever a detected system package is involved,
    # either as dependency or as the crate being tested.
    if grep -iq 'origin: system' <<< $solution; then
       echo UPDATING system repositories...
@@ -126,10 +127,10 @@ for file in $CHANGES; do
       echo FAIL: crate $milestone dependencies cannot be met
       exit 1
    fi
-   
+
    # Actual checks
    echo DEPLOYING CRATE $milestone
-   if $is_binary; then 
+   if $is_binary; then
       echo SKIPPING BUILD for BINARY crate, FETCHING only
       build_flag=""
    else
@@ -138,13 +139,13 @@ for file in $CHANGES; do
 
    alr get -d $build_flag -n $milestone
 
-   if $is_system; then 
+   if $is_system; then
       echo DETECTING INSTALLED PACKAGE via crate $milestone
       alr show -d --external-detect $milestone
    elif $is_binary; then
       echo FETCHED BINARY crate OK
    else
-      cd ${crate}_${version}_*
+      cd ${crate}_${version_noextras}_*
       echo BUILD ENVIRONMENT
       alr printenv
       echo LISTING EXECUTABLES of crate $milestone