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

[Massimiliano Torromeo]

    Date: Monday, October 7, 2019 @ 12:31:42
  Author: mtorromeo
Revision: 513728

Changed distribution type to support systemd notify service type

Modified:
  elasticsearch/trunk/PKGBUILD
  elasticsearch/trunk/elasticsearch-env
  elasticsearch/trunk/elasticsearch.service
  elasticsearch/trunk/elasticsearch at .service

------------------------+
 PKGBUILD               |   35 +++++++++++++++--------------------
 elasticsearch-env      |    2 +-
 elasticsearch.service  |    2 +-
 elasticsearch at .service |    2 +-
 4 files changed, 18 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-07 11:36:14 UTC (rev 513727)
+++ PKGBUILD	2019-10-07 12:31:42 UTC (rev 513728)
@@ -11,7 +11,7 @@
 license=('Apache')
 depends=('java-runtime-headless' 'systemd')
 source=(
-  "https://artifacts.elastic.co/downloads/$pkgname/$pkgname-oss-$pkgver-linux-x86_64.tar.gz"
+  "https://artifacts.elastic.co/downloads/$pkgname/$pkgname-oss-$pkgver-x86_64.rpm"
   elasticsearch-env
   elasticsearch.service
   elasticsearch at .service
@@ -22,10 +22,10 @@
   elasticsearch-tmpfile.conf
   elasticsearch.default
 )
-sha256sums=('d295bebef26b5ebebbdaa2c86abacd9498ab1b8a24de48f082edc350df56056f'
-            'ff530bf9440364955e9f38b5c5cc0782da1b1ac1c54870b162b7ded81e56eebc'
-            'dd8b20f822ad8c66b9fc54faf2763ff10a24ca661f49d1799e1b86b5e2e785af'
-            'ed24c03e7fa2339fe6077c68a48be66d36fe778435f050dd73d7990563b3e98e'
+sha256sums=('94fd86f9ec7e548b74ae133296048f7d942784fe84440ae48ef7153efff3f674'
+            '830bf17a9e1f88a8d6152899af2674571ecace88e202e484b56bf24f67d96e10'
+            '8ddd205b147f7d6904e6d6c5e32290d0bda0602b0de67d20e2107fd853391cc7'
+            '873cc91d35e7239e32bc04044e4a429220d85bea18a69a71efe188d6987039da'
             'bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f'
             '22a78a165a810608188faea6f2b0b381f27b1e9d60126c3b3e729124540589a8'
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
@@ -39,13 +39,10 @@
         'etc/default/elasticsearch')
 
 prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  find bin -type f \( -name \*.bat -o -name \*.exe \) -delete
-  find bin -type f \( -name \*.jar -o -name \*-env \) -exec chmod a-x {} +
-  find bin -type f ! -name \*.jar -exec \
+  cd "$srcdir"
+  find usr/share/elasticsearch/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 \
+  find usr/share/elasticsearch/bin -type f -name "elasticsearch-*" ! -name elasticsearch-bin -exec \
     sed 's/`dirname "$0"`/$(dirname "$(realpath "$0")")/' -i {} +
 }
 
@@ -56,20 +53,18 @@
   install -dm755 {usr/share,var/lib,var/log}/elasticsearch
   install -dm755 usr/bin
 
-  cd "$srcdir"/$pkgname-$pkgver
-  cp -R bin lib modules plugins "$pkgdir"/usr/share/elasticsearch/
-
-  cd config
-  for conf in *; do
-    install -Dm644 "$conf" "$pkgdir/etc/elasticsearch/$conf"
+  cd "$srcdir"
+  for conf in etc/elasticsearch/*; do
+    install -Dm644 "$conf" "$pkgdir/$conf"
   done
+  cp -R usr/share/elasticsearch/{bin,lib,modules,plugins} "$pkgdir"/usr/share/elasticsearch
 
-  cd ..
-  mv bin/elasticsearch-env .
+  cd "$pkgdir"/usr/share/elasticsearch
+  rm -rf bin/elasticsearch-env
+
   find bin/ -type f -name elasticsearch-\* ! -name elasticsearch-cli -exec \
     ln -s ../share/elasticsearch/{} "$pkgdir"/usr/{} \;
 
-  cd "$pkgdir"/usr/share/elasticsearch
   ln -s ../../../var/log/elasticsearch logs
   ln -s ../../../var/lib/elasticsearch data
 

Modified: elasticsearch-env
===================================================================
--- elasticsearch-env	2019-10-07 11:36:14 UTC (rev 513727)
+++ elasticsearch-env	2019-10-07 12:31:42 UTC (rev 513728)
@@ -51,7 +51,7 @@
 ES_PATH_CONF=`cd "$ES_PATH_CONF"; pwd`
 
 ES_DISTRIBUTION_FLAVOR=default
-ES_DISTRIBUTION_TYPE=tar
+ES_DISTRIBUTION_TYPE=rpm
 ES_BUNDLED_JDK=false
 
 if [ -z "$ES_TMPDIR" ]; then

Modified: elasticsearch.service
===================================================================
--- elasticsearch.service	2019-10-07 11:36:14 UTC (rev 513727)
+++ elasticsearch.service	2019-10-07 12:31:42 UTC (rev 513728)
@@ -24,7 +24,7 @@
 PermissionsStartOnly=true
 ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-keystore upgrade
 
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch -p ${PID_DIR}/elasticsearch.pid --quiet
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch -p ${PID_DIR}/elasticsearch.pid
 
 # StandardOutput is configured to redirect to journalctl since
 # some error messages may be logged in standard output before

Modified: elasticsearch at .service
===================================================================
--- elasticsearch at .service	2019-10-07 11:36:14 UTC (rev 513727)
+++ elasticsearch at .service	2019-10-07 12:31:42 UTC (rev 513728)
@@ -25,7 +25,7 @@
 PermissionsStartOnly=true
 ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-keystore upgrade
 
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch -p ${PID_DIR}/%I.pid --quiet
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch -p ${PID_DIR}/%I.pid
 
 # StandardOutput is configured to redirect to journalctl since
 # some error messages may be logged in standard output before