Updated starter snippet. Improved pkgver().

3 files changed, 7 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f04d6d1cca0..1ad1153f83c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = audiveris-git
 	pkgdesc = Music score OMR engine - current
-	pkgver = r4133.0bf682689
+	pkgver = 5.1.0.rc.r0.g0bf682689
 	pkgrel = 1
 	url = https://github.com/Audiveris/audiveris
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = audiveris-git
 	source = audiveris-git::git+https://github.com/Audiveris/audiveris.git
 	source = audiveris
 	sha256sums = SKIP
-	sha256sums = c697bdc3ff8b6c6e0efc273778f470e26971f250eeab89208688cf2dd2ef0517
+	sha256sums = 1c0ee49fc9ba9aa5d3dc260e649f0914d68ed8b18b40af2326763842e8d5ff46
 
 pkgname = audiveris-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2c8e72e1f237..8291ed89d0d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Hervé Bitteur <herve.bitteur@audiveris.com>
 _pkgname=audiveris
 pkgname="${_pkgname}-git"
-pkgver=r4133.0bf682689
+pkgver=5.1.0.rc.r0.g0bf682689
 pkgrel=1
 pkgdesc="Music score OMR engine - current"
 arch=('x86_64')
@@ -26,12 +26,12 @@ source=(
 )
 sha256sums=(
   'SKIP'
-  'c697bdc3ff8b6c6e0efc273778f470e26971f250eeab89208688cf2dd2ef0517'
+  '1c0ee49fc9ba9aa5d3dc260e649f0914d68ed8b18b40af2326763842e8d5ff46'
 )
 
 pkgver() {
   cd "$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
diff --git a/audiveris b/audiveris
index f804295745f6..1120cf85e9d1 100755
--- a/audiveris
+++ b/audiveris
@@ -1,5 +1,2 @@
-#!/bin/sh
-for name in /usr/share/java/audiveris/*.jar ; do
-  CP="$CP:$name"
-done
-exec /usr/bin/java -cp "${CP:1:${#CP}}" Audiveris "$@"
+#!/bin/bash
+exec /usr/bin/java -cp "$(find /usr/share/java/audiveris/ -name '*.jar' | paste -s -d:)" Audiveris "$@"