Changed distribution type to support systemd notify service type

5 files changed, 25 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28691bc00adf..1586aa218b6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,7 @@ pkgbase = elasticsearch-xpack
 	backup = etc/elasticsearch/log4j2.properties
 	backup = etc/elasticsearch/jvm.options
 	backup = etc/default/elasticsearch
-	source = https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.4.0-linux-x86_64.tar.gz
+	source = https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.4.0-x86_64.rpm
 	source = elasticsearch-env
 	source = elasticsearch.service
 	source = elasticsearch@.service
@@ -23,10 +23,10 @@ pkgbase = elasticsearch-xpack
 	source = elasticsearch-user.conf
 	source = elasticsearch-tmpfile.conf
 	source = elasticsearch.default
-	sha256sums = b712ced4a7feae46c3f966d52ac24f1b3418ee3ffbf0495a97f27ccf40878873
-	sha256sums = ff530bf9440364955e9f38b5c5cc0782da1b1ac1c54870b162b7ded81e56eebc
-	sha256sums = dd8b20f822ad8c66b9fc54faf2763ff10a24ca661f49d1799e1b86b5e2e785af
-	sha256sums = ed24c03e7fa2339fe6077c68a48be66d36fe778435f050dd73d7990563b3e98e
+	sha256sums = 1bfae41734c77af3bc66084ac0cc04add1190f9311b045d3c184ea7b3e688334
+	sha256sums = 830bf17a9e1f88a8d6152899af2674571ecace88e202e484b56bf24f67d96e10
+	sha256sums = 8ddd205b147f7d6904e6d6c5e32290d0bda0602b0de67d20e2107fd853391cc7
+	sha256sums = 873cc91d35e7239e32bc04044e4a429220d85bea18a69a71efe188d6987039da
 	sha256sums = bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f
 	sha256sums = 22a78a165a810608188faea6f2b0b381f27b1e9d60126c3b3e729124540589a8
 	sha256sums = b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c
diff --git a/PKGBUILD b/PKGBUILD
index 797083de3210..3205a32eb978 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ provides=('elasticsearch')
 conflicts=('elasticsearch')
 relpkgname=elasticsearch
 source=(
-  "https://artifacts.elastic.co/downloads/$relpkgname/$relpkgname-$pkgver-linux-x86_64.tar.gz"
+  "https://artifacts.elastic.co/downloads/$relpkgname/$relpkgname-$pkgver-x86_64.rpm"
   elasticsearch-env
   elasticsearch.service
   elasticsearch@.service
@@ -27,10 +27,10 @@ source=(
   elasticsearch-tmpfile.conf
   elasticsearch.default
 )
-sha256sums=('b712ced4a7feae46c3f966d52ac24f1b3418ee3ffbf0495a97f27ccf40878873'
-            'ff530bf9440364955e9f38b5c5cc0782da1b1ac1c54870b162b7ded81e56eebc'
-            'dd8b20f822ad8c66b9fc54faf2763ff10a24ca661f49d1799e1b86b5e2e785af'
-            'ed24c03e7fa2339fe6077c68a48be66d36fe778435f050dd73d7990563b3e98e'
+sha256sums=('1bfae41734c77af3bc66084ac0cc04add1190f9311b045d3c184ea7b3e688334'
+            '830bf17a9e1f88a8d6152899af2674571ecace88e202e484b56bf24f67d96e10'
+            '8ddd205b147f7d6904e6d6c5e32290d0bda0602b0de67d20e2107fd853391cc7'
+            '873cc91d35e7239e32bc04044e4a429220d85bea18a69a71efe188d6987039da'
             'bac40d87acaa5bee209ceb6dfa253009a072e9243fe3b94be42fb5cd44727d6f'
             '22a78a165a810608188faea6f2b0b381f27b1e9d60126c3b3e729124540589a8'
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
@@ -44,13 +44,10 @@ backup=('etc/elasticsearch/elasticsearch.yml'
         'etc/default/elasticsearch')
 
 prepare() {
-  cd "$srcdir"/$relpkgname-$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 {} +
 }
 
@@ -61,21 +58,20 @@ package() {
   install -dm755 {usr/share,var/lib,var/log}/elasticsearch
   install -dm755 usr/bin
 
-  cd "$srcdir"/$relpkgname-$pkgver
-  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  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"
+  install -Dvm644 usr/share/elasticsearch/LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  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 "$pkgdir"/usr/share/elasticsearch
+  rm -rf bin/elasticsearch-env
 
-  cd ..
-  mv 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
 
diff --git a/elasticsearch-env b/elasticsearch-env
index 49d1636be106..3c396b96d6d9 100644
--- a/elasticsearch-env
+++ b/elasticsearch-env
@@ -51,7 +51,7 @@ fi
 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
diff --git a/elasticsearch.service b/elasticsearch.service
index 37eb8e9c0529..6004eee0fc2b 100644
--- a/elasticsearch.service
+++ b/elasticsearch.service
@@ -24,7 +24,7 @@ Group=elasticsearch
 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
diff --git a/elasticsearch@.service b/elasticsearch@.service
index 18f4291e125a..37f795ec49fb 100644
--- a/elasticsearch@.service
+++ b/elasticsearch@.service
@@ -25,7 +25,7 @@ Group=elasticsearch
 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