diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-12-03 13:07:48 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-12-03 13:07:48 +0100 |
commit | a1b821da9e76d9a1fc9666f7ad3f97c6f4d9079d (patch) | |
tree | 43516197e12ca445c3a81031dcfb897ef890b386 /config | |
parent | 77406e88e658b2189ac31e715b564545c25a0fef (diff) |
Remove vespa-activate-application.
Diffstat (limited to 'config')
-rw-r--r-- | config/CMakeLists.txt | 1 | ||||
-rw-r--r-- | config/src/apps/vespa-activate-application/vespa-activate-application.sh | 95 |
2 files changed, 0 insertions, 96 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 7220a6cfa78..9fcab484ce9 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -55,5 +55,4 @@ vespa_define_module( src/tests/configparser ) -vespa_install_script(src/apps/vespa-activate-application/vespa-activate-application.sh vespa-activate-application bin) vespa_install_script(src/apps/vespa-config/vespa-config.pl libexec/vespa) diff --git a/config/src/apps/vespa-activate-application/vespa-activate-application.sh b/config/src/apps/vespa-activate-application/vespa-activate-application.sh deleted file mode 100644 index ca0bc0a50ba..00000000000 --- a/config/src/apps/vespa-activate-application/vespa-activate-application.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# BEGIN environment bootstrap section -# Do not edit between here and END as this section should stay identical in all scripts - -findpath () { - myname=${0} - mypath=${myname%/*} - myname=${myname##*/} - empty_if_start_slash=${mypath%%/*} - if [ "${empty_if_start_slash}" ]; then - mypath=$(pwd)/${mypath} - fi - if [ "$mypath" ] && [ -d "$mypath" ]; then - return - fi - mypath=$(pwd) - if [ -f "${mypath}/${myname}" ]; then - return - fi - echo "FATAL: Could not figure out the path where $myname lives from $0" - exit 1 -} - -COMMON_ENV=libexec/vespa/common-env.sh - -source_common_env () { - if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - export VESPA_HOME - common_env=$VESPA_HOME/$COMMON_ENV - if [ -f "$common_env" ]; then - . $common_env - return - fi - fi - return 1 -} - -findroot () { - source_common_env && return - if [ "$VESPA_HOME" ]; then - echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'" - exit 1 - fi - if [ "$ROOT" ] && [ -d "$ROOT" ]; then - VESPA_HOME="$ROOT" - source_common_env && return - fi - findpath - while [ "$mypath" ]; do - VESPA_HOME=${mypath} - source_common_env && return - mypath=${mypath%/*} - done - echo "FATAL: missing VESPA_HOME environment variable" - echo "Could not locate $COMMON_ENV anywhere" - exit 1 -} - -findhost () { - if [ "${VESPA_HOSTNAME}" = "" ]; then - 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 - export VESPA_HOSTNAME -} - -findroot -findhost - -# END environment bootstrap section - -ROOT=${VESPA_HOME%/} - -printf "WARNING: vespa-activate-application is deprecated, use 'vespa-deploy activate' instead\n\n" - -if [ "-f" == "$1" ] ; then - $ROOT/bin/vespa-deploy activate -else - STATUS=$($ROOT/bin/vespa-status-filedistribution) - if [ $? -eq 0 ] ; then - $ROOT/bin/vespa-deploy activate - else - echo "$STATUS" - echo - echo "Files are currently being distributed." - echo "If you want to see the status, call 'vespa-status-filedistribution'." - echo "Otherwise, call 'vespa-activate-application -f' to activate the application now; the file transfers will continue in the background." - exit 1 - fi -fi |