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

[Guillaume Alaux]

    Date: Wednesday, August 16, 2017 @ 13:20:41
  Author: guillaume
Revision: 251305

Move conf to etc

Added:
  sbt/trunk/sbt.install
Modified:
  sbt/trunk/PKGBUILD

-------------+
 PKGBUILD    |   16 ++++++++--------
 sbt.install |    8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-16 09:22:09 UTC (rev 251304)
+++ PKGBUILD	2017-08-16 13:20:41 UTC (rev 251305)
@@ -7,7 +7,7 @@
 epoch=1
 pkgver=1.0.0
 pkgrel=1
-pkgdesc='A build tool for Scala, Java, and more'
+pkgdesc='The interactive build tool'
 arch=('any')
 url='http://www.scala-sbt.org/'
 license=('BSD')
@@ -14,13 +14,14 @@
 depends=('java-runtime-headless' 'sh')
 IFS='.' read -a _pkgver <<< "${pkgver}"
 _majorver=${_pkgver[0]}.x
+install=sbt.install
 source=(https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tgz{,.asc}
         https://raw.githubusercontent.com/${pkgname}/${pkgname}/${_majorver}/LICENSE)
 validpgpkeys=('2EE0EA64E40A89B84B2DF73499E82A75642AC823') # sbt build tool
 sha256sums=('9ae04f4972145f2ac56c4deb868c9a5bb8b8b85c5151885dff3b997712645c5a'
             'SKIP'
-            '70b7b72694a56a3e922deaf5482273e7c33bab2c00c0c67fc0ccc5d33927ffed')
-#backup=(etc/${pkgname}/sbtopts)
+            'c822d385b1a73329846241799becf18690b5d44764c1bed69300b536a405030a')
+backup=(etc/${pkgname}/sbtopts)
 
 package() {
   cd "${pkgname}"
@@ -34,11 +35,10 @@
   mkdir -p "${pkgdir}"/usr/bin
   ln -s /usr/share/${pkgname}/bin/sbt "${pkgdir}"/usr/bin/sbt
 
-  # FIXME move usr/share/conf to /etc/sbt but watch-out, pacman does not handle it well
-  # also enable its file as `backup`
-  install -D -m 644 conf/sbtopts -t "${pkgdir}"/usr/share/${pkgname}/conf
-  mkdir -p "${pkgdir}"/etc/${pkgname}
-  ln -s /usr/share/${pkgname}/conf/sbtopts "${pkgdir}"/etc/${pkgname}/sbtopts
+  mkdir -p "${pkgdir}/etc"
+  cp -r conf "${pkgdir}"/etc/${pkgname}
+  rm "${pkgdir}"/etc/${pkgname}/sbtconfig.txt
+  ln -s /etc/${pkgname} "${pkgdir}"/usr/share/${pkgname}/conf
 
   install -D "${srcdir}"/LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
 }

Added: sbt.install
===================================================================
--- sbt.install	                        (rev 0)
+++ sbt.install	2017-08-16 13:20:41 UTC (rev 251305)
@@ -0,0 +1,8 @@
+# Config file switch does not play well with Pacman so let's clear this
+pre_upgrade() {
+  conf_link='/etc/sbt/sbtopts'
+  if [ -L $conf_link ]; then
+    unlink $conf_link
+    cp /usr/share/sbt/conf/sbtopts $conf_link
+  fi
+}