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

[Alexander Rødseth]

    Date: Tuesday, May 18, 2021 @ 07:36:43
  Author: arodseth
Revision: 936185

upgpkg: clojure 1.10.3.839-1

Modified:
  clojure/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-18 07:34:30 UTC (rev 936184)
+++ PKGBUILD	2021-05-18 07:36:43 UTC (rev 936185)
@@ -6,7 +6,7 @@
 # Contributor: Vladimir Tsanev <tsachev at gmail.com>
 
 pkgname=clojure
-pkgver=1.10.3.833
+pkgver=1.10.3.839
 pkgrel=1
 pkgdesc='Lisp dialect for the JVM'
 url='https://clojure.org/'
@@ -13,18 +13,18 @@
 arch=(any)
 license=(EPL)
 depends=(java-environment)
+makedepends=(setconf)
 optdepends=('leiningen: automate clojure projects'
             'rlwrap: friendly shell with readline support')
-makedepends=('setconf')
 install=clojure.install
-source=("https://download.clojure.org/install/clojure-tools-$pkgver.tar.gz"
-        clojure.sh)
-b2sums=('629480b2560d0c10d15bd5ee7af1f0415cb3e6d0d9f232a949bea3477259903a36d0ae7794499775c0aab77b452a08e1747be15b80b55bb34468dbb6ce509a48'
-        'c3d7f294fbc239e42e83f3833199b44c446a3ca3be00a9f8b27f57ee3427b5f39d6adc274e15355f0688296cabb59204cea5a3fd732f91313d30d02a6dd55664')
+source=("https://download.clojure.org/install/clojure-tools-$pkgver.tar.gz")
+b2sums=('59584e9ae3c3eb7e1d9a442062977ca6619eb2482b9ac5b292ba0e70ef9d5a025089e27ae3459e8ddfc3c680e7393bda33349ddd59c95b00c766842fccb1fd0c')
 
 prepare() {
-  sed -i -e 's,PREFIX,/usr/share/clojure,g' clojure-tools/clojure
-  setconf clojure-tools/clj install_dir=/usr
+  cd clojure-tools
+  setconf clj bin_dir=/usr/bin
+  setconf clojure install_dir=/usr/share/clojure
+  echo 'export CLOJURE_HOME=/usr/share/clojure' > clojure.sh
 }
 
 package() {
@@ -35,10 +35,10 @@
     "$pkgdir/usr/share/clojure/libexec/clojure-tools-$pkgver.jar"
   install -Dm755 clojure "$pkgdir/usr/bin/clojure"
   install -Dm755 clj "$pkgdir/usr/bin/clj"
+  install -Dm755 exec.jar "$pkgdir/usr/share/clojure/libexec/exec.jar"
+  install -Dm755 clojure.sh "$pkgdir/etc/profile.d/clojure.sh"
   install -Dm644 clojure.1 "$pkgdir/usr/share/man/man1/clojure.1"
   install -Dm644 clj.1 "$pkgdir/usr/share/man/man1/clj.1"
-  install -Dm755 "$srcdir/clojure.sh" "$pkgdir/etc/profile.d/clojure.sh"
-  install -Dm755 exec.jar "$pkgdir/usr/share/clojure/libexec/exec.jar"
 }
 
 # getver: raw.githubusercontent.com/clojure/brew-install/1.10.3/stable.properties