Merge branch 'release/v0.1.6'

README.md

@@ -42,14 +42,15 @@ sudo chmod +x /usr/local/bin/evm
 To uninstall, just remove the $EVM_HOME folder (usually ~/.evm)
 
 ## TODOs:
-- Support `kibana` command with following sub commands:
+- [x] Allows `evm install` installing pre-release versions: `alpha, beta, rc`
+- [ ] Supports `kibana` command with following sub commands:
  - `kibana install`: Install Kibana for current Elasticsearch version
  - `kibana remove`: Remove Kibana
  - `kibana start`: Start Kibana
  - `kibana stop`: Stop current running Kibana
-- Provide option `-k` for `evm start` command to allow Kibana starting with Elasticsearch
-- Provide `evm update` command to allow `evm` can update itself to latest version
-- Allow `evm install` installing unstable versions: `alpha, beta, rc`
+- [ ] Provides option `-k` for `evm start` command to allow Kibana starting with Elasticsearch
+- [ ] Provides `evm update` command to allow `evm` can update itself to latest version
+
 ## Licence
  This software is licensed under the Apache License, version 2 ("ALv2"), quoted below.
 

evm

@@ -64,7 +64,7 @@ _check_es_version() {
  if [[ -z "${version}" ]]; then
  _abort "A version is required."
  fi
- if [[ ! "${version}" =~ ^([0-9]+\.){2}(\*|[0-9]+)$ ]]; then
+ if [[ ! "${version}" =~ ^([0-9]+\.){2}([0-9]+)(\-[a-z0-9]+)*$ ]]; then
  _abort "Invalid version: '${version}'."
  fi
 }
@@ -73,7 +73,7 @@ _get_current_es_version() {
  local path="$(find "${EVM_HOME}" -type l -name "${ES_NAME}" -exec readlink {} +)"
  if [[ ! -z "${path}" ]]; then
  local current_version="$(basename "${path}")"
- echo "${current_version}" | cut -d "-" -f 2
+ echo "${current_version#*-}"
  fi
 }
 
@@ -312,7 +312,7 @@ list_es_versions() {
  local current_version="$(_get_current_es_version)"
  for e in $(find "${EVM_HOME}" -maxdepth 1 -mindepth 1 -type d -name "${ES_NAME}-*" | sort -nr); do
  local version="$(basename "${e}")"
- version="$(echo "${version}" | cut -d "-" -f 2)"
+ version="$(echo "${version#*-}")"
  if [[ "${current_version}" = "${version}" ]]; then
  echo -e "\033[0;32m* ${version}\033[0m"
  else