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

Massimiliano Torromeo mtorromeo at archlinux.org
Mon Jan 7 07:22:03 UTC 2019


    Date: Monday, January 7, 2019 @ 07:22:02
  Author: mtorromeo
Revision: 420927

Fixed bin scripts (FS#61288)

Modified:
  elasticsearch/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-07 06:56:11 UTC (rev 420926)
+++ PKGBUILD	2019-01-07 07:22:02 UTC (rev 420927)
@@ -4,7 +4,7 @@
 
 pkgname=elasticsearch
 pkgver=6.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('any')
 url="https://www.elastic.co/products/elasticsearch"
@@ -45,11 +45,13 @@
   find bin -type f \( -name \*.jar -o -name \*-env \) -exec chmod a-x {} +
   find bin -type f ! -name \*.jar -exec \
     sed -r 's;source .*/(.*)-env;source /usr/share/elasticsearch/\1-env;' -i {} +
+  find bin -type f -name "elasticsearch-*" ! -name elasticsearch-bin -exec \
+    sed 's/`dirname "$0"`/$(dirname "$(realpath "$0")")/' -i {} +
 }
 
 package() {
   cd "$pkgdir"
-  install -dm750 etc/elasticsearch/scripts
+  install -dm750 etc/elasticsearch{,/scripts}
   install -dm755 {usr/share,var/lib,var/log}/elasticsearch
   install -dm755 usr/bin
 
@@ -60,16 +62,15 @@
   for conf in *; do
     install -Dm644 "$conf" "$pkgdir/etc/elasticsearch/$conf"
   done
+
   cd ..
+  mv bin/elasticsearch-env .
+  find bin/ -type f -name elasticsearch-\* ! -name elasticsearch-cli -exec \
+    ln -s ../share/elasticsearch/{} "$pkgdir"/usr/{} \;
 
-  for script in elasticsearch{-keystore,-plugin,-sql-cli}; do
-    ln -s ../share/elasticsearch/bin/$script "$pkgdir"/usr/bin/$script
-  done
-
   cd "$pkgdir"/usr/share/elasticsearch
   ln -s ../../../var/log/elasticsearch logs
   ln -s ../../../var/lib/elasticsearch data
-  mv bin/*-env .
 
   cd "$pkgdir"
   install -Dm644 "$srcdir"/elasticsearch-env usr/share/elasticsearch/elasticsearch-env



More information about the arch-commits mailing list