Allow passing arguments to dev/environment-setup.sh

Arguments are passed through to kayobe-env in kayobe-config, which
allows to set the Kayobe environment.

Change-Id: I4c72e32e5379237340284a09874b0c500e41ad0f
This commit is contained in:
Mark Goddard 2021-09-07 08:44:35 +01:00
parent e8769373b6
commit 7b16300c8f
2 changed files with 6 additions and 3 deletions

View File

@ -11,6 +11,9 @@ set -o pipefail
# environment. This script should be sourced rather than executed in a
# subprocess. e.g. source dev/environment-setup.sh
# Arguments passed to this script are passed through to the kayobe-env script
# in kayobe-config. This can be used to set the Kayobe environment.
PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${PARENT}/functions"
@ -18,10 +21,10 @@ source "${PARENT}/functions"
function main {
config_init
environment_setup
environment_setup "$@"
}
main
main "$@"
# Restore previous shell options.
eval "$oldstate"

View File

@ -215,7 +215,7 @@ function environment_setup {
set +u
source "${KAYOBE_VENV_PATH}/bin/activate"
set -u
source "${KAYOBE_CONFIG_SOURCE_PATH}/kayobe-env"
source "${KAYOBE_CONFIG_SOURCE_PATH}/kayobe-env" "$@"
}
function run_kayobe {