Date: Monday, August 25, 2014 @ 14:23:11 Author: mtorromeo Revision: 117866
upgpkg: elasticsearch 1.3.2-2 Updated to use java-default-runtime without patching the scripts Modified: elasticsearch/trunk/PKGBUILD elasticsearch/trunk/elasticsearch.default elasticsearch/trunk/elasticsearch.service elasticsearch/trunk/[email protected] ------------------------+ PKGBUILD | 13 ++++--------- elasticsearch.default | 2 ++ elasticsearch.service | 1 + [email protected] | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-25 11:56:06 UTC (rev 117865) +++ PKGBUILD 2014-08-25 12:23:11 UTC (rev 117866) @@ -5,7 +5,7 @@ pkgname=elasticsearch pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('i686' 'x86_64') url="http://www.elasticsearch.org/"; @@ -21,11 +21,11 @@ elasticsearch.default ) sha256sums=('7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4' - 'f3a6e5b968ffe38edc42c80193f75ab1682a5224c977c8957816d321733aabc4' - 'c3ea4d82da44da8ea9bcb4d7d9cdfb086d25fd8ec2ea457adec290f0d6ebe083' + '3c3aaa3439b7b5db2171cb87f674a5df0f74aed427e87debebb780738b1557cb' + 'fe6c38d29bdde0ea5c0f1798bcd194912a269167cd8caa35289fbb59c037cfda' 'b3feb1e9c7e7ce6b33cea6c727728ed700332aae942ca475c3bcc1d56b9f113c' '39ab5801b45c0f49af43c4d1826a655a981bfa07e4b3791d7a0719f8c191d8d9' - 'a0ee0761156a02d3f79db5ef295613c1a6d4267482c8db889d92a94b59feb497') + 'd29a050c80739801a340231a8bf5e8b565ee2a46285482f3425319349c2df6c5') backup=('etc/elasticsearch/elasticsearch.yml' 'etc/elasticsearch/logging.yml' @@ -37,11 +37,6 @@ for script in plugin elasticsearch; do sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \ -i bin/$script - - for java in jre jdk; do - sed "/^CDPATH/i [ -f /etc/profile.d/$java.sh ] && . /etc/profile.d/$java.sh" \ - -i bin/$script - done done sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh bin/plugin Modified: elasticsearch.default =================================================================== --- elasticsearch.default 2014-08-25 11:56:06 UTC (rev 117865) +++ elasticsearch.default 2014-08-25 12:23:11 UTC (rev 117866) @@ -1,3 +1,5 @@ +JAVA_HOME=/usr/lib/jvm/java-default-runtime + # Heap Size (defaults to 256m min, 1g max) #ES_HEAP_SIZE=1g Modified: elasticsearch.service =================================================================== --- elasticsearch.service 2014-08-25 11:56:06 UTC (rev 117865) +++ elasticsearch.service 2014-08-25 12:23:11 UTC (rev 117866) @@ -8,6 +8,7 @@ User=elasticsearch Group=elasticsearch ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/elasticsearch.pid +Environment=JAVA_HOME=/usr/lib/jvm/java-default-runtime EnvironmentFile=-/etc/default/elasticsearch RuntimeDirectory=elasticsearch PIDFile=/run/elasticsearch/elasticsearch.pid Modified: [email protected] =================================================================== --- [email protected] 2014-08-25 11:56:06 UTC (rev 117865) +++ [email protected] 2014-08-25 12:23:11 UTC (rev 117866) @@ -8,6 +8,7 @@ User=elasticsearch Group=elasticsearch ExecStart=/usr/bin/elasticsearch -d -p /run/elasticsearch/%I.pid -Des.config=/etc/elasticsearch/%I.yml +Environment=JAVA_HOME=/usr/lib/jvm/java-default-runtime EnvironmentFile=-/etc/default/elasticsearch RuntimeDirectory=elasticsearch PIDFile=/run/elasticsearch/%I.pid
