summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorraember2018-08-06 10:40:56 +0200
committerraember2018-08-06 10:40:56 +0200
commitedb12ee87c311f7455b12f65d2cb5478720954cd (patch)
treea3a7ad1cd14a16fde0f532e8d6995acc0fe59e95
parent72be3df093bd28e4a2e640d582bf860cc2d8a71a (diff)
downloadaur-edb12ee87c311f7455b12f65d2cb5478720954cd.tar.gz
Simplified starter script. Added msg2 comments.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD13
-rwxr-xr-xaudiveris2
3 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index db2abbfae1bf..c5a515a768ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,7 @@ pkgbase = audiveris
source = audiveris-5.1.0-rc.tar.gz::https://github.com/Audiveris/audiveris/archive/5.1.0-rc.tar.gz
source = audiveris
sha256sums = 1ea51e880c1bb867708ac917801056dd25686389d354d4683eb7ee972811ee1d
- sha256sums = 1c0ee49fc9ba9aa5d3dc260e649f0914d68ed8b18b40af2326763842e8d5ff46
+ sha256sums = 12223d402f4f6719051df7ab4776a82c7326c41f49403d4d1868c5b041678743
pkgname = audiveris
diff --git a/PKGBUILD b/PKGBUILD
index 4e1601ddf36c..7c33d5e1895f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,12 +22,11 @@ source=(
"$pkgname-${pkgver/_/-}.tar.gz::https://github.com/Audiveris/$pkgname/archive/${pkgver/_/-}.tar.gz"
"$pkgname"
)
-sha256sums=(
- '1ea51e880c1bb867708ac917801056dd25686389d354d4683eb7ee972811ee1d'
- '1c0ee49fc9ba9aa5d3dc260e649f0914d68ed8b18b40af2326763842e8d5ff46'
-)
+sha256sums=('1ea51e880c1bb867708ac917801056dd25686389d354d4683eb7ee972811ee1d'
+ '12223d402f4f6719051df7ab4776a82c7326c41f49403d4d1868c5b041678743')
prepare() {
+ msg2 'Replacing git commit request with static commit hash'
sed -i "s/git rev-parse --short HEAD/echo '0bf68268962228f6993c52e77349fc44e7c17162'/g" "$srcdir/$pkgname-${pkgver/_/-}/build.gradle"
}
@@ -37,16 +36,16 @@ build() {
}
package() {
- # extract libraries
+ msg2 'Extracting libraries'
install -dm755 "$pkgdir/usr/share/java/$pkgname"
bsdtar -C "$pkgdir/usr/share/java/$pkgname" --strip-components=2 \
-xf "$srcdir/$pkgname-${pkgver/_/-}/build/distributions/Audiveris.tar" \
Audiveris/lib/*
- # start script
+ msg2 'Creating starter script'
install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
- # Javadoc
+ msg2 'Installing JavaDoc'
install -dm755 "$pkgdir/usr/share/doc"
cp -r "$srcdir/$pkgname-${pkgver/_/-}/build/docs/javadoc" "$pkgdir/usr/share/doc/$pkgname"
}
diff --git a/audiveris b/audiveris
index 1120cf85e9d1..6a47bbc45b66 100755
--- a/audiveris
+++ b/audiveris
@@ -1,2 +1,2 @@
#!/bin/bash
-exec /usr/bin/java -cp "$(find /usr/share/java/audiveris/ -name '*.jar' | paste -s -d:)" Audiveris "$@"
+exec /usr/bin/java -cp "/usr/share/java/audiveris/*" Audiveris "$@"