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

[Guillaume Alaux]

    Date: Tuesday, September 1, 2015 @ 22:33:38
  Author: guillaume
Revision: 139080

Fix FS#44059 profile config script causes warning

Modified:
  sbt/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-01 19:29:50 UTC (rev 139079)
+++ PKGBUILD	2015-09-01 20:33:38 UTC (rev 139080)
@@ -3,6 +3,8 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Leif Warner <abimelech at gmail.com>
 
+# TODO: remove old files from svn (Licenses, sbt, …)
+
 pkgname=sbt
 epoch=1
 pkgver=0.13.8
@@ -13,27 +15,29 @@
 license=('BSD')
 depends=('java-runtime-headless' 'sh')
 IFS='.' read -a _pkgver <<< "${pkgver}"
-source=(http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${pkgver}/sbt-launch.jar
-        https://raw.githubusercontent.com/${pkgname}/${pkgname}/${_pkgver[1].${_pkgver[2]}}/LICENSE
+source=(https://dl.bintray.com/${pkgname}/native-packages/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tgz
+        https://raw.githubusercontent.com/${pkgname}/${pkgname}/${_pkgver[0]}.${_pkgver[1]}/LICENSE
         sbt.sh
         sbt.conf.sh
         sbt.conf.csh)
-sha256sums=('6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158'
-            '8753689166238271fd8dceb33ff9dbd90fd8620a56b8387bca2b8807ce3209ca'
+sha256sums=('f481c5db5b9e5ef35d87be9cd30a917e363812d67f218b25ae0c9e66078417dd'
+            '70b7b72694a56a3e922deaf5482273e7c33bab2c00c0c67fc0ccc5d33927ffed'
             '68f25719dde7e7de53e5f42eddd5d36e275a83cbb9f6a28208f245404233a6c7'
             'b90676fc30faa4ad2ec3beb7815491bb58cd6e057ec0593664344d6711482357'
             'b8825593744535787d2c227b61e4ffa2e95a7da071a6488c108ad79abeb9e182')
 
 package() {
-  install -d "${pkgdir}"/usr/share/java/${pkgname}
-  install -m755 sbt-launch.jar "${pkgdir}"/usr/share/java/${pkgname}
+  install -d "${pkgdir}"/usr/share
+  cp -r "${srcdir}/${pkgname}" "${pkgdir}"/usr/share
+  rm "${pkgdir}/usr/share/${pkgname}/bin/sbt.bat"
+  rm "${pkgdir}/usr/share/${pkgname}/conf/sbtconfig.txt"
+  find "${pkgdir}/usr/share/${pkgname}" -type f ! -name sbt -exec chmod -x {} \;
 
-  install -d "${pkgdir}"/usr/bin/
-  install -Dm755 "${srcdir}"/sbt.sh "${pkgdir}"/usr/bin/sbt
+  install -d "${pkgdir}"/usr/bin
+  ln -s "/usr/share/${pkgname}/bin/sbt" "${pkgdir}"/usr/bin/sbt
 
-  install -d "${pkgdir}"/etc/profile.d
-  install -Dm644 "${srcdir}"/sbt.conf.sh "${pkgdir}"/etc/profile.d/sbt.sh
-  install -Dm644 "${srcdir}"/sbt.conf.csh "${pkgdir}"/etc/profile.d/sbt.csh
+  install -d "${pkgdir}/etc/${pkgname}"
+  ln -s "/usr/share/${pkgname}/conf/sbtopts" "${pkgdir}/etc/${pkgname}/sbtopts"
 
   install -D -m644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }