Update PKGBUILD manually before the next release

3 files changed, 42 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea0835921b81..2d3c5e6bf74a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = bloop
-pkgdesc = Bloop gives you fast edit/compile/test workflows for Scala.
-pkgver = 1.4.0
-pkgrel = 1
-url = https://scalacenter.github.io/bloop/
-arch = any
-license = Apache
-depends = java-environment>=8
-depends = coursier>=2.0.0_RC6_13
-source = https://github.com/scalacenter/bloop/releases/download/v1.4.0/bloop-coursier.json
-sha256sums = 2d20aa6650d4d214c494a3307110a18b4ad317fa7e76531aeec8be5b3ea12c6b
-source = https://github.com/scalacenter/bloop/releases/download/v1.4.0/bash-completions
-sha256sums = da6b7ecd4109bd0ff98b1c452d9dd9d26eee0d28ff604f6c83fb8d3236a6bdd1
-source = https://github.com/scalacenter/bloop/releases/download/v1.4.0/zsh-completions
-sha256sums = 58d32c3f005f7791237916d1b5cd3a942115236155a0b7eba8bf36391d06eff7
-source = https://github.com/scalacenter/bloop/releases/download/v1.4.0/fish-completions
-sha256sums = a012a5cc76b57dbce17fad237f3b97bea6946ffc6ea0b61ac2281141038248dd
+	pkgdesc = Bloop gives you fast edit/compile/test workflows for Scala.
+	pkgver = 1.4.1
+	pkgrel = 1
+	url = https://scalacenter.github.io/bloop/
+	arch = any
+	license = Apache
+	depends = java-environment>=8
+	depends = coursier>=2.0.0_RC6_13
+	source = bloop-coursier-channel-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/bloop-coursier.json
+	source = bloop-bash-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/bash-completions
+	source = bloop-zsh-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/zsh-completions
+	source = bloop-fish-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/fish-completions
+	sha256sums = 2e6a873183e5e22712913bfdab1331d0a7792167c369fee5be0c83e27572fe12
+	sha256sums = da6b7ecd4109bd0ff98b1c452d9dd9d26eee0d28ff604f6c83fb8d3236a6bdd1
+	sha256sums = 58d32c3f005f7791237916d1b5cd3a942115236155a0b7eba8bf36391d06eff7
+	sha256sums = a012a5cc76b57dbce17fad237f3b97bea6946ffc6ea0b61ac2281141038248dd
+
 pkgname = bloop
+
diff --git a/.gitignore b/.gitignore
index 79368a7938ee..9bf031a47bd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 src/
 pkg/
 *.tar.xz
-install.py
+bloop*
diff --git a/PKGBUILD b/PKGBUILD
index 8d7c134811de..ac61148ac906 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,42 @@
 # Maintainer: Guillaume Raffin <theelectronwill@gmail.com>
 # Generator: Bloop release utilities <https://github.com/scalacenter/bloop>
 pkgname=bloop
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Bloop gives you fast edit/compile/test workflows for Scala."
 arch=(any)
 url="https://scalacenter.github.io/bloop/"
 license=('Apache')
 depends=('java-environment>=8' 'coursier>=2.0.0_RC6_13')
-source=('bloop-coursier-channel-1.4.0::https://github.com/scalacenter/bloop/releases/download/v1.4.0/bloop-coursier.json' 'bloop-bash-1.4.0::https://github.com/scalacenter/bloop/releases/download/v1.4.0/bash-completions' 'bloop-zsh-1.4.0::https://github.com/scalacenter/bloop/releases/download/v1.4.0/zsh-completions' 'bloop-fish-1.4.0::https://github.com/scalacenter/bloop/releases/download/v1.4.0/fish-completions')
-sha256sums=('2d20aa6650d4d214c494a3307110a18b4ad317fa7e76531aeec8be5b3ea12c6b' 'da6b7ecd4109bd0ff98b1c452d9dd9d26eee0d28ff604f6c83fb8d3236a6bdd1' '58d32c3f005f7791237916d1b5cd3a942115236155a0b7eba8bf36391d06eff7' 'a012a5cc76b57dbce17fad237f3b97bea6946ffc6ea0b61ac2281141038248dd')
+source=('bloop-coursier-channel-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/bloop-coursier.json' 'bloop-bash-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/bash-completions' 'bloop-zsh-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/zsh-completions' 'bloop-fish-1.4.1::https://github.com/scalacenter/bloop/releases/download/v1.4.1/fish-completions')
+sha256sums=('2e6a873183e5e22712913bfdab1331d0a7792167c369fee5be0c83e27572fe12'
+            'da6b7ecd4109bd0ff98b1c452d9dd9d26eee0d28ff604f6c83fb8d3236a6bdd1'
+            '58d32c3f005f7791237916d1b5cd3a942115236155a0b7eba8bf36391d06eff7'
+            'a012a5cc76b57dbce17fad237f3b97bea6946ffc6ea0b61ac2281141038248dd')
 
 build() {
-  mkdir channel
-  mv "bloop-coursier-channel-1.4.0" "channel/bloop.json"
-  coursier install --install-dir "$srcdir" --default-channels=false --channel channel bloop
+  mkdir -p channel
+  mv "bloop-coursier-channel-1.4.1" "channel/bloop.json"
+  coursier install --install-dir "$srcdir" --default-channels=false --channel channel --only-prebuilt=true bloop
 }
 
 package() {
   cd "$srcdir"
 
-  ## binaries
-  install -Dm755 bloop "$pkgdir"/usr/bin/bloop
+  # patch the bloop launcher so that it works when symlinked from /usr/bin
+  sed 's|$(dirname "$0")|/usr/lib/bloop|' -i bloop
+       
+  # install to /usr/lib/bloop
+  # NOTE: bloop is just a launcher, the actual program is .bloop.aux
+  install -Dm755 bloop "$pkgdir"/usr/lib/bloop/bloop
+  install -Dm755 .bloop.aux "$pkgdir"/usr/lib/bloop/.bloop.aux
+  
+  # add link to /usr/bin
+  mkdir -p "$pkgdir"/usr/bin
+  ln -s /usr/lib/bloop/bloop "$pkgdir"/usr/bin/bloop
 
   # shell completion
-  install -Dm644 bloop-bash-1.4.0 "$pkgdir"/etc/bash_completion.d/bloop
-  install -Dm644 bloop-zsh-1.4.0 "$pkgdir"/usr/share/zsh/site-functions/_bloop
-  install -Dm644 bloop-fish-1.4.0 "$pkgdir"/usr/share/fish/vendor_completions.d/bloop.fish
+  install -Dm644 bloop-bash-1.4.1 "$pkgdir"/etc/bash_completion.d/bloop
+  install -Dm644 bloop-zsh-1.4.1 "$pkgdir"/usr/share/zsh/site-functions/_bloop
+  install -Dm644 bloop-fish-1.4.1 "$pkgdir"/usr/share/fish/vendor_completions.d/bloop.fish
 }