Skip to content
Snippets Groups Projects
Commit 603aaf47 authored by Simon McVittie's avatar Simon McVittie
Browse files

depot: Allow overriding location of pressure-vessel relocatable install


This makes it a bit easier to test new pressure-vessel versions
without editing the depot in-place.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 51c83206
No related branches found
No related tags found
No related merge requests found
......@@ -206,11 +206,13 @@ else
ln -fns "${name}_${current_build_id}" "${here}/${name}"
fi
adverb="$here/pressure-vessel/bin/pressure-vessel-adverb"
pressure_vessel="${PRESSURE_VESSEL_PREFIX:-"${here}/pressure-vessel"}"
adverb="$pressure_vessel/bin/pressure-vessel-adverb"
# Fallback to the old name
if ! [ -x "$adverb" ]; then
adverb="$here/pressure-vessel/bin/pressure-vessel-with-lock"
adverb="$pressure_vessel/bin/pressure-vessel-with-lock"
fi
# GC old runtimes
......
......@@ -202,11 +202,13 @@ check_ok_for_filename NAME "$name"
check_ok_for_filename RUNTIME "$runtime"
check_ok_for_filename SUITE "$suite"
adverb="$here/pressure-vessel/bin/pressure-vessel-adverb"
pressure_vessel="${PRESSURE_VESSEL_PREFIX:-"${here}/pressure-vessel"}"
adverb="$pressure_vessel/bin/pressure-vessel-adverb"
# Fallback to the old name
if ! [ -x "$adverb" ]; then
adverb="$here/pressure-vessel/bin/pressure-vessel-with-lock"
adverb="$pressure_vessel/bin/pressure-vessel-with-lock"
fi
if [ -n "$deploy" ]; then
......@@ -254,6 +256,6 @@ fi
export PRESSURE_VESSEL_RUNTIME_BASE="${here}"
export PRESSURE_VESSEL_RUNTIME="${name}/files"
exec "$here/pressure-vessel/bin/pressure-vessel-unruntime" "$@"
exec "$pressure_vessel/bin/pressure-vessel-unruntime" "$@"
# vim:set sw=4 sts=4 et:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment