update no conflict

10 files changed, 84 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 272288892cd0..f042959b686d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,32 @@
-pkgbase = elasticsearch5
+pkgbase = elasticsearch5-noconflict
 	pkgdesc = Distributed RESTful search engine built on top of Lucene
 	pkgver = 5.6.9
 	pkgrel = 2
 	url = https://www.elastic.co/products/elasticsearch
-	install = elasticsearch.install
+	install = elasticsearch5.install
 	arch = any
 	license = APACHE
 	depends = java-runtime-headless=8
 	depends = systemd
 	provides = elasticsearch=5.6.9
-	conflicts = elasticsearch
-	backup = etc/elasticsearch/elasticsearch.yml
-	backup = etc/elasticsearch/log4j2.properties
-	backup = etc/elasticsearch/jvm.options
-	backup = etc/default/elasticsearch
+	backup = etc/elasticsearch5/elasticsearch.yml
+	backup = etc/elasticsearch5/log4j2.properties
+	backup = etc/elasticsearch5/jvm.options
+	backup = etc/default/elasticsearch5
 	source = https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.9.tar.gz
-	source = elasticsearch.service
-	source = elasticsearch@.service
-	source = elasticsearch-sysctl.conf
-	source = elasticsearch-user.conf
-	source = elasticsearch-tmpfile.conf
-	source = elasticsearch.default
+	source = elasticsearch5.service
+	source = elasticsearch5@.service
+	source = elasticsearch5-sysctl.conf
+	source = elasticsearch5-user.conf
+	source = elasticsearch5-tmpfile.conf
+	source = elasticsearch5.default
 	sha256sums = 64b9486d5bdeb6f85d09fdc30aa2d0e1ce7fb8f253084a8d7cb15652494da96a
-	sha256sums = f228b588345780cfc84c229dd92722e024c0da155976afc96fc5e5970428a9e4
-	sha256sums = 4dc14262b67399f741c303cce7d18f9d3d220285778a2deb50fb0640161179c7
+	sha256sums = 645b819bc01652d483202f76f42c0c0d5929c55e28492ad743caeb16087cc537
+	sha256sums = e54f7857cfdaf7bc8d28f081864c363634e2e3d4e603c146b298bfe3c430d7ad
 	sha256sums = b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c
 	sha256sums = 815f6a39db6f54bb40750c382ffbdc298d2c4c187ee8ea7e2f855923e2ff354b
-	sha256sums = 3173e3efa429507e6329f518699a072dfd442d9b5da7c62452a55f82334dd2b5
+	sha256sums = 19fb0e711354d014473dadb0cf37117ab7557887443177de0d091f5991a9376c
 	sha256sums = bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8
 
-pkgname = elasticsearch5
+pkgname = elasticsearch5-noconflict
 
diff --git a/PKGBUILD b/PKGBUILD
index 03be80bbe03a..3a95005b3d42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Bill Ruddock <https://github.com/biinari>
+# Maintainer: Tung Ha <tunght13488 PLUS archlinux AT gmail DOT com>
+# Contributor: Bill Ruddock <https://github.com/biinari>
 # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
-# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
+# Contributor: Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 _pkgname=elasticsearch
-pkgname=elasticsearch5
+pkgname=elasticsearch5-noconflict
 pkgver=5.6.9
 pkgrel=2
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
@@ -12,73 +13,73 @@ arch=('any')
 url="https://www.elastic.co/products/elasticsearch"
 license=('APACHE')
 depends=('java-runtime-headless=8' 'systemd')
-conflicts=('elasticsearch')
 provides=("elasticsearch=$pkgver")
-install='elasticsearch.install'
+install='elasticsearch5.install'
 source=(
   "https://artifacts.elastic.co/downloads/$_pkgname/$_pkgname-$pkgver.tar.gz"
-  elasticsearch.service
-  elasticsearch@.service
-  elasticsearch-sysctl.conf
-  elasticsearch-user.conf
-  elasticsearch-tmpfile.conf
-  elasticsearch.default
+  elasticsearch5.service
+  elasticsearch5@.service
+  elasticsearch5-sysctl.conf
+  elasticsearch5-user.conf
+  elasticsearch5-tmpfile.conf
+  elasticsearch5.default
 )
 sha256sums=('64b9486d5bdeb6f85d09fdc30aa2d0e1ce7fb8f253084a8d7cb15652494da96a'
-            'f228b588345780cfc84c229dd92722e024c0da155976afc96fc5e5970428a9e4'
-            '4dc14262b67399f741c303cce7d18f9d3d220285778a2deb50fb0640161179c7'
+            '645b819bc01652d483202f76f42c0c0d5929c55e28492ad743caeb16087cc537'
+            'e54f7857cfdaf7bc8d28f081864c363634e2e3d4e603c146b298bfe3c430d7ad'
             'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c'
             '815f6a39db6f54bb40750c382ffbdc298d2c4c187ee8ea7e2f855923e2ff354b'
-            '3173e3efa429507e6329f518699a072dfd442d9b5da7c62452a55f82334dd2b5'
+            '19fb0e711354d014473dadb0cf37117ab7557887443177de0d091f5991a9376c'
             'bb74e5fb8bc28f2125e015395ab05bea117b72bfc6dadbca827694b362ee0bf8')
 
-backup=('etc/elasticsearch/elasticsearch.yml'
-        'etc/elasticsearch/log4j2.properties'
-        'etc/elasticsearch/jvm.options'
-        'etc/default/elasticsearch')
+backup=('etc/elasticsearch5/elasticsearch.yml'
+        'etc/elasticsearch5/log4j2.properties'
+        'etc/elasticsearch5/jvm.options'
+        'etc/default/elasticsearch5')
 
 prepare() {
   cd "$srcdir"/$_pkgname-$pkgver
 
   for script in elasticsearch{,-plugin,-translog}; do
-    sed -e 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
+    sed -e 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch5|' \
         -e '/^ES_HOME=.*pwd/d' \
-        -e 's|$ES_HOME/config|/etc/elasticsearch|' \
+        -e 's|$ES_HOME/config|/etc/elasticsearch5|' \
         -i bin/$script
   done
 
-  sed -re 's;#\s*(path\.conf:).*$;\1 /etc/elasticsearch;' \
-    -e '0,/#\s*(path\.data:).*$/s;;\1 /var/lib/elasticsearch;' \
-    -e 's;#\s*(path\.work:).*$;\1 /tmp/elasticsearch;' \
-    -e 's;#\s*(path\.logs:).*$;\1 /var/log/elasticsearch;' \
+  sed -re 's;#\s*(path\.conf:).*$;\1 /etc/elasticsearch5;' \
+    -e '0,/#\s*(path\.data:).*$/s;;\1 /var/lib/elasticsearch5;' \
+    -e 's;#\s*(path\.work:).*$;\1 /tmp/elasticsearch5;' \
+    -e 's;#\s*(path\.logs:).*$;\1 /var/log/elasticsearch5;' \
     -i config/elasticsearch.yml
 }
 
 package() {
   cd "$pkgdir"
-  install -dm750 etc/elasticsearch/scripts
-  install -dm755 usr/share/elasticsearch/plugins
-  install -dm755 var/lib/elasticsearch
-  install -dm755 var/log/elasticsearch
+  install -dm750 etc/elasticsearch5/scripts
+  install -dm755 usr/share/elasticsearch5/plugins
+  install -dm755 var/lib/elasticsearch5
+  install -dm755 var/log/elasticsearch5
 
-  install -Dm644 "$srcdir"/elasticsearch.service usr/lib/systemd/system/elasticsearch.service
-  install -Dm644 "$srcdir"/elasticsearch@.service usr/lib/systemd/system/elasticsearch@.service
-  install -Dm644 "$srcdir"/elasticsearch-user.conf usr/lib/sysusers.d/elasticsearch.conf
-  install -Dm644 "$srcdir"/elasticsearch-tmpfile.conf usr/lib/tmpfiles.d/elasticsearch.conf
-  install -Dm644 "$srcdir"/elasticsearch-sysctl.conf usr/lib/sysctl.d/elasticsearch.conf
-  install -Dm644 "$srcdir"/elasticsearch.default etc/default/elasticsearch
+  install -Dm644 "$srcdir"/elasticsearch5.service usr/lib/systemd/system/elasticsearch5.service
+  install -Dm644 "$srcdir"/elasticsearch5@.service usr/lib/systemd/system/elasticsearch5@.service
+  install -Dm644 "$srcdir"/elasticsearch5-user.conf usr/lib/sysusers.d/elasticsearch5.conf
+  install -Dm644 "$srcdir"/elasticsearch5-tmpfile.conf usr/lib/tmpfiles.d/elasticsearch5.conf
+  install -Dm644 "$srcdir"/elasticsearch5-sysctl.conf usr/lib/sysctl.d/elasticsearch5.conf
+  install -Dm644 "$srcdir"/elasticsearch5.default etc/default/elasticsearch5
 
   cd "$srcdir"/$_pkgname-$pkgver
-  cp -R lib modules "$pkgdir"/usr/share/elasticsearch/
+  cp -R lib modules "$pkgdir"/usr/share/elasticsearch5/
 
-	cd config
-	for conf in *; do
-		install -Dm644 "$conf" "$pkgdir/etc/elasticsearch/$conf"
-	done
-	cd ..
+  cd config
+  for conf in *; do
+    install -Dm644 "$conf" "$pkgdir/etc/elasticsearch5/$conf"
+  done
+  cd ..
 
-  for script in elasticsearch{,-plugin,-translog}; do
-    install -Dm755 bin/$script "$pkgdir"/usr/bin/$script
+  install -Dm755 bin/elasticsearch "$pkgdir"/usr/bin/elasticsearch5
+  for script in {-plugin,-translog}; do
+    install -Dm755 bin/elasticsearch$script "$pkgdir"/usr/bin/elasticsearch5$script
   done
-  install -Dm644 bin/elasticsearch.in.sh "$pkgdir"/usr/share/elasticsearch/bin/elasticsearch.in.sh
+  install -Dm644 bin/elasticsearch.in.sh "$pkgdir"/usr/share/elasticsearch5/bin/elasticsearch.in.sh
 }
diff --git a/elasticsearch-tmpfile.conf b/elasticsearch-tmpfile.conf
deleted file mode 100644
index 5a869cc06103..000000000000
--- a/elasticsearch-tmpfile.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-d /var/log/elasticsearch 0755 elasticsearch elasticsearch -
-d /var/lib/elasticsearch 0755 elasticsearch elasticsearch -
-d /usr/share/elasticsearch/plugins 0755 elasticsearch elasticsearch -
-
-d /etc/elasticsearch 0750 - elasticsearch -
-d /etc/elasticsearch/scripts 0750 - elasticsearch -
diff --git a/elasticsearch-sysctl.conf b/elasticsearch5-sysctl.conf
index 32da2c91cf27..32da2c91cf27 100644
--- a/elasticsearch-sysctl.conf
+++ b/elasticsearch5-sysctl.conf
diff --git a/elasticsearch5-tmpfile.conf b/elasticsearch5-tmpfile.conf
new file mode 100644
index 000000000000..36d89e8d26b4
--- /dev/null
+++ b/elasticsearch5-tmpfile.conf
@@ -0,0 +1,6 @@
+d /var/log/elasticsearch5 0755 elasticsearch elasticsearch -
+d /var/lib/elasticsearch5 0755 elasticsearch elasticsearch -
+d /usr/share/elasticsearch5/plugins 0755 elasticsearch elasticsearch -
+
+d /etc/elasticsearch5 0750 - elasticsearch -
+d /etc/elasticsearch5/scripts 0750 - elasticsearch -
diff --git a/elasticsearch-user.conf b/elasticsearch5-user.conf
index d67b6c3fdde1..d67b6c3fdde1 100644
--- a/elasticsearch-user.conf
+++ b/elasticsearch5-user.conf
diff --git a/elasticsearch.default b/elasticsearch5.default
index ade7ae924ddd..ade7ae924ddd 100644
--- a/elasticsearch.default
+++ b/elasticsearch5.default
diff --git a/elasticsearch.install b/elasticsearch5.install
index 2b4c4cc21b7b..840321c23fc2 100644
--- a/elasticsearch.install
+++ b/elasticsearch5.install
@@ -1,14 +1,14 @@
 post_install() {
-    systemd-sysusers elasticsearch.conf
-    systemd-tmpfiles --create elasticsearch.conf
+    systemd-sysusers elasticsearch5.conf
+    systemd-tmpfiles --create elasticsearch5.conf
 }
 
 post_upgrade(){
-    systemd-tmpfiles --create elasticsearch.conf
+    systemd-tmpfiles --create elasticsearch5.conf
 
     if [ "$(vercmp "$2" 5.0.0)" -lt 0 ]; then
         echo " >> "
-        echo " >> Major version update. Please take a look at breaking changes https://www.elastic.co/guide/en/elasticsearch/reference/5.0/breaking-changes-5.0.html and remove incompatible plugins from /usr/share/elasticsearch/plugins"
+        echo " >> Major version update. Please take a look at breaking changes https://www.elastic.co/guide/en/elasticsearch/reference/5.0/breaking-changes-5.0.html and remove incompatible plugins from /usr/share/elasticsearch5/plugins"
         echo " >> "
     fi
 }
diff --git a/elasticsearch.service b/elasticsearch5.service
index 534b71b8663e..2fd8d45bbf61 100644
--- a/elasticsearch.service
+++ b/elasticsearch5.service
@@ -6,20 +6,20 @@ After=network.target
 
 [Service]
 Type=forking
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/elasticsearch.pid
+RuntimeDirectory=elasticsearch5
+PIDFile=/run/elasticsearch5/elasticsearch.pid
 
 Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
-Environment=CONF_DIR=/etc/elasticsearch
-EnvironmentFile=-/etc/default/elasticsearch
+Environment=CONF_DIR=/etc/elasticsearch5
+EnvironmentFile=-/etc/default/elasticsearch5
 
-WorkingDirectory=/usr/share/elasticsearch
+WorkingDirectory=/usr/share/elasticsearch5
 
 User=elasticsearch
 Group=elasticsearch
 
-ExecStart=/usr/bin/elasticsearch -d \
-            -p /run/elasticsearch/elasticsearch.pid \
+ExecStart=/usr/bin/elasticsearch5 -d \
+            -p /run/elasticsearch5/elasticsearch.pid \
             -E path.conf=${CONF_DIR}
 
 LimitNOFILE=65536
diff --git a/elasticsearch@.service b/elasticsearch5@.service
index a5e3df99944d..21018c6409a7 100644
--- a/elasticsearch@.service
+++ b/elasticsearch5@.service
@@ -6,20 +6,20 @@ After=network.target
 
 [Service]
 Type=forking
-RuntimeDirectory=elasticsearch
-PIDFile=/run/elasticsearch/%I.pid
+RuntimeDirectory=elasticsearch5
+PIDFile=/run/elasticsearch5/%I.pid
 
 Environment=JAVA_HOME=/usr/lib/jvm/default-runtime
-Environment=CONF_DIR=/etc/elasticsearch/%I
-EnvironmentFile=-/etc/default/elasticsearch
+Environment=CONF_DIR=/etc/elasticsearch5/%I
+EnvironmentFile=-/etc/default/elasticsearch5
 
-WorkingDirectory=/usr/share/elasticsearch
+WorkingDirectory=/usr/share/elasticsearch5
 
 User=elasticsearch
 Group=elasticsearch
 
-ExecStart=/usr/bin/elasticsearch -d \
-            -p /run/elasticsearch/%I.pid \
+ExecStart=/usr/bin/elasticsearch5 -d \
+            -p /run/elasticsearch5/%I.pid \
             -E path.conf=${CONF_DIR}
 
 LimitNOFILE=65536