diff options
Diffstat (limited to 'vespabase')
-rwxr-xr-x | vespabase/src/common-env.sh | 2 | ||||
-rwxr-xr-x | vespabase/src/rhel-prestart.sh | 2 | ||||
-rwxr-xr-x | vespabase/src/start-cbinaries.sh | 4 | ||||
-rwxr-xr-x | vespabase/src/start-tool.sh | 2 | ||||
-rwxr-xr-x | vespabase/src/start-vespa-base.sh | 2 | ||||
-rwxr-xr-x | vespabase/src/stop-vespa-base.sh | 2 | ||||
-rwxr-xr-x | vespabase/src/vespa-start-configserver.sh | 6 | ||||
-rwxr-xr-x | vespabase/src/vespa-start-services.sh | 6 | ||||
-rwxr-xr-x | vespabase/src/vespa-stop-configserver.sh | 4 | ||||
-rwxr-xr-x | vespabase/src/vespa-stop-services.sh | 4 |
10 files changed, 8 insertions, 26 deletions
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 50ee3d70feb..39107ae5500 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -124,7 +124,7 @@ consider_fallback VESPA_VALGRIND_OPT "--num-callers=32 \ --freelist-vol=1000000000 \ --leak-check=full \ --show-reachable=yes \ ---suppressions=${VESPA_HOME}etc/vespa/suppressions.txt" +--suppressions=${VESPA_HOME}/etc/vespa/suppressions.txt" consider_fallback VESPA_USE_HUGEPAGES_LIST $(get_var "hugepages_list") consider_fallback VESPA_USE_HUGEPAGES_LIST "all" diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh index 2a1a119200b..9c20ddd78f5 100755 --- a/vespabase/src/rhel-prestart.sh +++ b/vespabase/src/rhel-prestart.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh index e9a34298be1..40e859f7b9e 100755 --- a/vespabase/src/start-cbinaries.sh +++ b/vespabase/src/start-cbinaries.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then @@ -135,7 +133,7 @@ configure_vespa_malloc () { if $no_valgrind || $use_callgrind; then # should really check that format is same as binary below for pre in lib64 lib; do - tryfile="${VESPA_HOME}${pre}/${suf}" + tryfile="${VESPA_HOME}/${pre}/${suf}" if [ -f "$tryfile" ]; then LD_PRELOAD="$tryfile" log_debug_message "Using LD_PRELOAD='$tryfile'" diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh index 2efaa4e24a7..4a2ddbb61cf 100755 --- a/vespabase/src/start-tool.sh +++ b/vespabase/src/start-tool.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh index 4cb5d3644f6..cb97c245dea 100755 --- a/vespabase/src/start-vespa-base.sh +++ b/vespabase/src/start-vespa-base.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh index eb5d992612f..dde1cb880b0 100755 --- a/vespabase/src/stop-vespa-base.sh +++ b/vespabase/src/stop-vespa-base.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh index 2882efce2fa..cba6cbfd740 100755 --- a/vespabase/src/vespa-start-configserver.sh +++ b/vespabase/src/vespa-start-configserver.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then @@ -60,8 +58,8 @@ findroot # END environment bootstrap section -${VESPA_HOME}bin/vespa-prestart.sh || exit 1 -willrun=${VESPA_HOME}libexec/vespa/start-configserver +${VESPA_HOME}/bin/vespa-prestart.sh || exit 1 +willrun=${VESPA_HOME}/libexec/vespa/start-configserver if [ -x $willrun ]; then echo "Starting $willrun as a background process." >&2 exec </dev/null diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh index 73fd18a54ab..e3cdf855850 100755 --- a/vespabase/src/vespa-start-services.sh +++ b/vespabase/src/vespa-start-services.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then @@ -60,8 +58,8 @@ findroot # END environment bootstrap section -${VESPA_HOME}bin/vespa-prestart.sh || exit 1 -willrun=${VESPA_HOME}libexec/vespa/start-vespa-base.sh +${VESPA_HOME}/bin/vespa-prestart.sh || exit 1 +willrun=${VESPA_HOME}/libexec/vespa/start-vespa-base.sh if [ -x $willrun ]; then echo "Starting $willrun as a background process." >&2 exec </dev/null diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh index 45f9c4a33ed..33532744ae3 100755 --- a/vespabase/src/vespa-stop-configserver.sh +++ b/vespabase/src/vespa-stop-configserver.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then @@ -60,7 +58,7 @@ findroot # END environment bootstrap section -willrun=${VESPA_HOME}libexec/vespa/stop-configserver +willrun=${VESPA_HOME}/libexec/vespa/stop-configserver if [ -x $willrun ]; then echo "Executing $willrun" >&2 exec $willrun diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh index e4ea4a6a5e4..8d519a5fa9e 100755 --- a/vespabase/src/vespa-stop-services.sh +++ b/vespabase/src/vespa-stop-services.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then @@ -60,7 +58,7 @@ findroot # END environment bootstrap section -willrun=${VESPA_HOME}libexec/vespa/stop-vespa-base.sh +willrun=${VESPA_HOME}/libexec/vespa/stop-vespa-base.sh if [ -x $willrun ]; then echo "Executing $willrun" >&2 exec $willrun |