diff options
Diffstat (limited to 'vespaclient-java/src/main')
9 files changed, 45 insertions, 18 deletions
diff --git a/vespaclient-java/src/main/sh/vespa-destination.sh b/vespaclient-java/src/main/sh/vespa-destination.sh index 00171806b69..3b11b151727 100755 --- a/vespaclient-java/src/main/sh/vespa-destination.sh +++ b/vespaclient-java/src/main/sh/vespa-destination.sh @@ -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/vespaclient-java/src/main/sh/vespa-document-statistics.sh b/vespaclient-java/src/main/sh/vespa-document-statistics.sh index 16b7e1f1b37..ee72574fbc7 100755 --- a/vespaclient-java/src/main/sh/vespa-document-statistics.sh +++ b/vespaclient-java/src/main/sh/vespa-document-statistics.sh @@ -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/vespaclient-java/src/main/sh/vespa-feeder.sh b/vespaclient-java/src/main/sh/vespa-feeder.sh index ff45587b9fc..3c1dfaed60d 100755 --- a/vespaclient-java/src/main/sh/vespa-feeder.sh +++ b/vespaclient-java/src/main/sh/vespa-feeder.sh @@ -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/vespaclient-java/src/main/sh/vespa-get.sh b/vespaclient-java/src/main/sh/vespa-get.sh index d6a9108fedd..aef730923de 100644 --- a/vespaclient-java/src/main/sh/vespa-get.sh +++ b/vespaclient-java/src/main/sh/vespa-get.sh @@ -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/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh index 031034f9371..281ce97009a 100755 --- a/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh +++ b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh @@ -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/vespaclient-java/src/main/sh/vespa-stat.sh b/vespaclient-java/src/main/sh/vespa-stat.sh index 08d87685b67..d8c33d979d0 100644 --- a/vespaclient-java/src/main/sh/vespa-stat.sh +++ b/vespaclient-java/src/main/sh/vespa-stat.sh @@ -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/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh index 555fdc464c6..675b8548d81 100755 --- a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh +++ b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh @@ -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/vespaclient-java/src/main/sh/vespa-visit-target.sh b/vespaclient-java/src/main/sh/vespa-visit-target.sh index 72d4aac120b..8e57a70b970 100755 --- a/vespaclient-java/src/main/sh/vespa-visit-target.sh +++ b/vespaclient-java/src/main/sh/vespa-visit-target.sh @@ -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/vespaclient-java/src/main/sh/vespa-visit.sh b/vespaclient-java/src/main/sh/vespa-visit.sh index b84a906f41e..5fa9e9451d6 100755 --- a/vespaclient-java/src/main/sh/vespa-visit.sh +++ b/vespaclient-java/src/main/sh/vespa-visit.sh @@ -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 } |