master: generate-version.sh: don't print version_n_root=0 for branch builds

The branch "master" has been updated in SBCL:
       via  3a7a5218d4f926e211178ed25eb790f5ada88d61 (commit)
      from  de7356db63a4d52db2c116c902305016036e86d5 (commit)

- Log -----------------------------------------------------------------
commit 3a7a5218d4f926e211178ed25eb790f5ada88d61
Author: Luís Borges de Oliveira <[email protected]>
Date:   Tue May 19 16:16:55 2020 +0100

    generate-version.sh: don't print version_n_root=0 for branch builds
    
    Before: "2.0.5.0.foo.12"
    After: "2.0.5.foo.12"
---
 generate-version.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/generate-version.sh b/generate-version.sh
index 52e4d6917..9e00aecd0 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -76,22 +76,22 @@ cat >version.lisp-expr <<EOF
 ;;; you re-run make.sh, this file will be overwritten if you are
 ;;; working from a Git checkout.
 EOF
+if [ "0" = "$version_n_root" ]
+then
+    version_n_root_pretty=""
+else
+    version_n_root_pretty=".$version_n_root"
+fi
 if [ "$version_base" = "$version_head" ]
 then
-    if [ "0" = "$version_n_root" ]
-    then
-        printf "\"%s%s\"\n" \
-            $version_release $version_dirty >>version.lisp-expr
-    else
-        printf "\"%s.%s%s%s\"\n" \
-            $version_release $version_n_root \
-            $version_hash $version_dirty >>version.lisp-expr
-    fi
+    printf "\"%s%s%s%s\"\n" \
+           $version_release "$version_n_root_pretty" \
+           $version_hash $version_dirty >>version.lisp-expr
 else
     echo "base=$version_base"
     echo "head=$version_head"
-    printf "\"%s.%s.%s.%s%s%s\"\n" \
-        $version_release $version_n_root \
-        $version_branchname $version_n_branch \
-        $version_hash $version_dirty >>version.lisp-expr
+    printf "\"%s%s.%s.%s%s%s\"\n" \
+           $version_release "$version_n_root_pretty" \
+           $version_branchname $version_n_branch \
+           $version_hash $version_dirty >>version.lisp-expr
 fi

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL

_______________________________________________
Sbcl-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sbcl-commits