From 8229a57c5369997bff01d3dc13480de897b47837 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sun, 30 Jul 2017 05:14:25 +0900 Subject: [PATCH] Cleanup script packaging This commit cleans up a few items with the script packaging: - remove the now dead elasticsearch.in.sh script - add assertions for the existence elasticsearch-env and elasticsearch-keystore --- .../src/main/resources/bin/elasticsearch.in.sh | 13 ------------- .../src/test/resources/packaging/utils/tar.bash | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 distribution/src/main/resources/bin/elasticsearch.in.sh diff --git a/distribution/src/main/resources/bin/elasticsearch.in.sh b/distribution/src/main/resources/bin/elasticsearch.in.sh deleted file mode 100644 index 2d224392256..00000000000 --- a/distribution/src/main/resources/bin/elasticsearch.in.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# check in case a user was using this mechanism -if [ "x$ES_CLASSPATH" != "x" ]; then - cat >&2 << EOF -Error: Don't modify the classpath with ES_CLASSPATH. Best is to add -additional elements via the plugin mechanism, or if code must really be -added to the main classpath, add jars to lib/ (unsupported). -EOF - exit 1 -fi - -ES_CLASSPATH="$ES_HOME/lib/*" diff --git a/qa/vagrant/src/test/resources/packaging/utils/tar.bash b/qa/vagrant/src/test/resources/packaging/utils/tar.bash index 5a34cb5b9fd..b56c372d516 100644 --- a/qa/vagrant/src/test/resources/packaging/utils/tar.bash +++ b/qa/vagrant/src/test/resources/packaging/utils/tar.bash @@ -87,7 +87,8 @@ verify_archive_installation() { assert_file "$ESHOME" d elasticsearch elasticsearch 755 assert_file "$ESHOME/bin" d elasticsearch elasticsearch 755 assert_file "$ESHOME/bin/elasticsearch" f elasticsearch elasticsearch 755 - assert_file "$ESHOME/bin/elasticsearch.in.sh" f elasticsearch elasticsearch 755 + assert_file "$ESHOME/bin/elasticsearch-env" f elasticsearch elasticsearch 755 + assert_file "$ESHOME/bin/elasticsearch-keystore" f elasticsearch elasticsearch 755 assert_file "$ESHOME/bin/elasticsearch-plugin" f elasticsearch elasticsearch 755 assert_file "$ESHOME/bin/elasticsearch-translog" f elasticsearch elasticsearch 755 assert_file "$ESCONFIG" d elasticsearch elasticsearch 755