[arch-commits] Commit in ditaa/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Sunday, July 22, 2018 @ 19:49:11
  Author: arodseth
Revision: 362869

upgpkg: ditaa 0.11.0-1

Modified:
  ditaa/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-22 19:11:40 UTC (rev 362868)
+++ PKGBUILD	2018-07-22 19:49:11 UTC (rev 362869)
@@ -12,9 +12,11 @@
 license=('GPL')
 depends=('gsfonts' 'java-environment>=8')
 makedepends=('apache-ant' 'git')
-source=("git+https://github.com/stathissideris/ditaa#tag=v$pkgver"
+source=("https://github.com/stathissideris/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver-standalone.jar"
+        "git+https://github.com/stathissideris/$pkgname#tag=v$pkgver"
         $pkgname.sh)
-sha256sums=('SKIP'
+sha256sums=('9418aa63ff6d89c5d2318396f59836e120e75bea7a5930c4d34aa10fe7a196a9'
+            'SKIP'
             '77f95a7c3235a1263b560844f988445083895550385bff1a4c28313b0767e38f')
 
 prepare() {
@@ -21,9 +23,9 @@
   local oldver="0_9"
   local shortver=${pkgver%.0}
   local underver=${shortver/./_}
-  sed -i "s|$oldver|$underver|" $pkgname/build/release.xml
+  sed -i "s|$oldver|${shortver/./_}|" $pkgname/build/release.xml
   sed -i 's|1.6|1.8|g' $pkgname/build/release.xml
-  sed -i "s|VERSION|$underver|" $pkgname.sh
+  sed -i "s|VERSION|$shortver|" $pkgname.sh
   mkdir -p $pkgname/{bin,lib}
   sed -i 's|</javac>|<compilerarg value="-Xlint:unchecked"/></javac>|g' $pkgname/build/release.xml
 }
@@ -31,16 +33,16 @@
 build() {
   cd "$pkgname"
 
-  # TODO: Build with leiningen, after moving from AUR to [community]
-
-  ant -buildfile build/release.xml release-jar
+  # TODO: Build with leiningen, after moving it from AUR to [community]
+  #ant -buildfile build/release.xml release-jar
 }
 
 package() {
   local shortver=${pkgver%.0}
-  local underver=${shortver/./_}
-  install -Dm755 "$pkgname/releases/$pkgname$shortver.jar" \
-    "$pkgdir/usr/share/java/$pkgname/ditaa-$shortver.jar"
+  install -Dm644 "$srcdir/$pkgname-$pkgver-standalone.jar" \
+    "$pkgdir/usr/share/java/$pkgname/$pkgname-$shortver.jar"
+  #install -Dm644 "$pkgname/releases/$pkgname$shortver.jar" \
+  #  "$pkgdir/usr/share/java/$pkgname/$pkgname-$shortver.jar"
   install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
 }