From 283b841136acd2bef2c438f7d3c9e4daca579e7f Mon Sep 17 00:00:00 2001
From: Chris Pinnock <chris_pinnock@mac.com>
Date: Wed, 21 Feb 2024 21:10:46 +0000
Subject: [PATCH] Packages: For development versions use the commit hash

---
 scripts/pkg-common/utils.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/pkg-common/utils.sh b/scripts/pkg-common/utils.sh
index 6b3aaa1079d0..91b1d4203803 100644
--- a/scripts/pkg-common/utils.sh
+++ b/scripts/pkg-common/utils.sh
@@ -115,12 +115,20 @@ warnings() {
 
 getOctezVersion() {
 
-  if ! _vers=$(dune exec octez-version 2> /dev/null); then
+  if ! _vers=$(dune exec src/lib_version/exe/tezos_print_version.exe -- --full-with-commit 2> /dev/null); then
     echo "Cannot get version. Try eval \`opam env\`?" >&2
     exit 1
   fi
-  _vers_fix=$(echo "$_vers" | sed -e 's/\~//' -e 's/\+//')
+  _vers_fix=$(echo "$_vers" | awk -F' ' '{print $1}')
+
+  case $_vers_fix in
+  *dev)
+    _vers_fix="$_vers_fix-$(echo "$_vers" | sed -e 's|.*(||g' -e 's|)||g')"
+    ;;
+  esac
+
   echo "$_vers_fix"
+
 }
 
 # Build init.d scripts
-- 
GitLab