Fedora-21 does not have openjdk-1.7.0 it has only 1.8.0.
This change also fixing the no op statement in the configure.
Change-Id: I6012aeb17b8e8fafa37d48aa29482702fa3491fd
... | ... |
@@ -44,7 +44,7 @@ function download_elasticsearch { |
44 | 44 |
|
45 | 45 |
function configure_elasticsearch { |
46 | 46 |
# currently a no op |
47 |
- :: |
|
47 |
+ : |
|
48 | 48 |
} |
49 | 49 |
|
50 | 50 |
function start_elasticsearch { |
... | ... |
@@ -78,7 +78,11 @@ function install_elasticsearch { |
78 | 78 |
sudo dpkg -i ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.deb |
79 | 79 |
sudo update-rc.d elasticsearch defaults 95 10 |
80 | 80 |
elif is_fedora; then |
81 |
- is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless |
|
81 |
+ if [[ "$os_RELEASE" -ge "21" ]]; then |
|
82 |
+ is_package_installed java-1.8.0-openjdk-headless || install_package java-1.8.0-openjdk-headless |
|
83 |
+ else |
|
84 |
+ is_package_installed java-1.7.0-openjdk-headless || install_package java-1.7.0-openjdk-headless |
|
85 |
+ fi |
|
82 | 86 |
yum_install ${FILES}/elasticsearch-${ELASTICSEARCH_VERSION}.noarch.rpm |
83 | 87 |
sudo /bin/systemctl daemon-reload |
84 | 88 |
sudo /bin/systemctl enable elasticsearch.service |