Updating to Bloop v1.2.3 (bloopoid test)

2 files changed, 37 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98cbf1e2cd78..24f562694b9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
 pkgbase = bloop
-	pkgdesc = Scala build server and command-line tool for fast developer workflows
-	pkgver = 1.2.3
-	pkgrel = 1
-	url = https://scalacenter.github.io/bloop/
-	arch = any
-	license = Apache
-	depends = scala
-	depends = python
-	source = https://github.com/scalacenter/bloop/releases/download/v1.2.3/install.py
-	md5sums = 784a5b8cbfdb8df1cee1b7e7b3f28a41
-
+pkgdesc = Bloop gives you fast edit/compile/test workflows for Scala.
+pkgver = 1.2.3
+pkgrel = 1
+url = https://scalacenter.github.io/bloop/
+arch = any
+license = Apache
+depends = scala
+depends = python
+source = https://github.com/scalacenter/bloop/releases/download/v1.2.3/install.py
+sha256sums = 25a18e6983463725e821f6f4f369cfef8d37f18c4dddb6a1cc1e85fa2961b9c8
 pkgname = bloop
-
diff --git a/PKGBUILD b/PKGBUILD
index b9a162c195a6..8056b82a0184 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,46 @@
-# Maintainer: Guillaume Raffin <theelectronwill@gmail.com>
-
 pkgname=bloop
 pkgver=1.2.3
-pkgrel=2
-pkgdesc="Scala build server and command-line tool for fast developer workflows"
+pkgrel=1
+pkgdesc="Bloop gives you fast edit/compile/test workflows for Scala."
 arch=(any)
 url="https://scalacenter.github.io/bloop/"
 license=('Apache')
 depends=('scala' 'python')
-
-source=("https://github.com/scalacenter/bloop/releases/download/v$pkgver/install.py")
-md5sums=('784a5b8cbfdb8df1cee1b7e7b3f28a41')
+source=("https://github.com/scalacenter/bloop/releases/download/v1.2.3/install.py")
+sha256sums=('25a18e6983463725e821f6f4f369cfef8d37f18c4dddb6a1cc1e85fa2961b9c8')
 
 build() {
-  # prepare bloop in local directory
   python ./install.py --dest "$srcdir/bloop"
-
   # fix paths
-  sed -i "s|$srcdir/bloop|/usr/lib/bloop|g" "bloop/systemd/bloop.service"
-  sed -i "s|$srcdir/bloop|/usr/lib/bloop|g" "bloop/xdg/bloop.desktop"
+  sed -i "s|$srcdir/bloop|/usr/bin|g" bloop/systemd/bloop.service
+  sed -i "s|$srcdir/bloop/xdg|/usr/share/pixmaps|g" bloop/xdg/bloop.desktop
+  sed -i "s|$srcdir/bloop|/usr/lib/bloop|g" bloop/xdg/bloop.desktop
 }
 
 package() {
-  # move bloop files to installation dir
-  mkdir -p "$pkgdir"/usr/lib/bloop
-  mv "$srcdir/bloop" "$pkgdir"/usr/lib/
+  cd "$srcdir/bloop"
 
-  # link binaries
-  mkdir -p "$pkgdir"/usr/bin
-  ln -s /usr/lib/bloop/blp-server   "$pkgdir"/usr/bin/blp-server
-  ln -s /usr/lib/bloop/blp-coursier "$pkgdir"/usr/bin/blp-coursier
-  ln -s /usr/lib/bloop/bloop        "$pkgdir"/usr/bin/bloop
+  ## binaries
+  # we use /usr/lib/bloop so that we can add a .jvmopts file in it
+  install -Dm755 blp-server "$pkgdir"/usr/lib/bloop/blp-server
+  install -Dm755 blp-coursier "$pkgdir"/usr/lib/bloop/blp-coursier
+  install -Dm755 bloop "$pkgdir"/usr/lib/bloop/bloop
 
-  # link desktop file
-  mkdir -p "$pkgdir"/usr/share/applications
-  ln -s /usr/lib/bloop/xdg/bloop.desktop "$pkgdir"/usr/share/applications/bloop.desktop
+  # links in /usr/bin
+  mkdir -p "$pkgdir/usr/bin"
+  ln -s /usr/lib/bloop/blp-server "$pkgdir"/usr/bin/blp-server
+  ln -s /usr/lib/bloop/blp-coursier "$pkgdir"/usr/bin/blp-coursier
+  ln -s /usr/lib/bloop/bloop "$pkgdir"/usr/bin/bloop
 
-  # install shell completion
-  mkdir -p "$pkgdir"/usr/share/zsh/site-functions
-  mv "$pkgdir"/usr/lib/bloop/zsh/_bloop "$pkgdir"/usr/share/zsh/site-functions/
-  mkdir -p "$pkgdir"/usr/share/fish/vendor_completions.d/
-  mv "$pkgdir"/usr/lib/bloop/fish/bloop.fish "$pkgdir"/usr/share/fish/vendor_completions.d/
-  mkdir -p "$pkgdir"/etc/bash_completion.d
-  mv "$pkgdir"/usr/lib/bloop/bash/bloop "$pkgdir"/etc/bash_completion.d/
+  # desktop file
+  install -Dm644 xdg/bloop.png "$pkgdir"/usr/share/pixmaps/bloop.png
+  install -Dm755 xdg/bloop.desktop "$pkgdir"/usr/share/applications/bloop.desktop
 
-  # install systemd service
-  mkdir -p "$pkgdir"/usr/lib/systemd/user
-  mv "$pkgdir"/usr/lib/bloop/systemd/bloop.service "$pkgdir"/usr/lib/systemd/user/
+  # shell completion
+  install -Dm644 bash/bloop "$pkgdir"/etc/bash_completion.d/bloop
+  install -Dm644 zsh/_bloop "$pkgdir"/usr/share/zsh/site-functions/_bloop
+  install -Dm644 fish/bloop.fish "$pkgdir"/usr/share/fish/vendor_completions.d/bloop.fish
 
-  # cleanup bloop directory
-  rmdir "$pkgdir"/usr/lib/bloop/zsh "$pkgdir"/usr/lib/bloop/bash "$pkgdir"/usr/lib/bloop/fish "$pkgdir"/usr/lib/bloop/systemd
+  # systemd service
+  install -Dm644 systemd/bloop.service "$pkgdir"/usr/lib/systemd/user/bloop.service
 }