diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2018-05-16 06:49:56 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2018-05-16 07:32:17 +0000 |
| commit | a51021d1a2e737deefde42777e58d8e364af91ad (patch) | |
| tree | 51a80363a1a19af91758c4322340ad5ea3ca4786 /zkfacade | |
| parent | 8cabaa3da3bdf7a1de5cbf320772edd676763b26 (diff) | |
update bootstrap
Diffstat (limited to 'zkfacade')
| -rwxr-xr-x | zkfacade/src/main/sh/zkcat | 7 | ||||
| -rwxr-xr-x | zkfacade/src/main/sh/zkcli | 7 | ||||
| -rwxr-xr-x | zkfacade/src/main/sh/zkctl | 7 | ||||
| -rwxr-xr-x | zkfacade/src/main/sh/zkls | 7 |
4 files changed, 20 insertions, 8 deletions
diff --git a/zkfacade/src/main/sh/zkcat b/zkfacade/src/main/sh/zkcat index b9de9364836..675aeabbcfb 100755 --- a/zkfacade/src/main/sh/zkcat +++ b/zkfacade/src/main/sh/zkcat @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } diff --git a/zkfacade/src/main/sh/zkcli b/zkfacade/src/main/sh/zkcli index 67866274709..cbc356ae9e1 100755 --- a/zkfacade/src/main/sh/zkcli +++ b/zkfacade/src/main/sh/zkcli @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } diff --git a/zkfacade/src/main/sh/zkctl b/zkfacade/src/main/sh/zkctl index fe0a257baa0..721becf8c79 100755 --- a/zkfacade/src/main/sh/zkctl +++ b/zkfacade/src/main/sh/zkctl @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } diff --git a/zkfacade/src/main/sh/zkls b/zkfacade/src/main/sh/zkls index a7c95eee224..c75f63efbde 100755 --- a/zkfacade/src/main/sh/zkls +++ b/zkfacade/src/main/sh/zkls @@ -56,9 +56,12 @@ findroot () { findhost () { if [ "${VESPA_HOSTNAME}" = "" ]; then - VESPA_HOSTNAME=$(vespa-detect-hostname) || exit 1 + VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1 + fi + validate="${VESPA_HOME}/bin/vespa-validate-hostname" + if [ -f "$validate" ]; then + "$validate" "${VESPA_HOSTNAME}" || exit 1 fi - vespa-validate-hostname "${VESPA_HOSTNAME}" || exit 1 export VESPA_HOSTNAME } |