Compare commits

..

No commits in common. "838b932cac914642fb8c707209a5923f0f6de933" and "40e87863912a996f479ebab3fcf72a74c9a4b063" have entirely different histories.

2 changed files with 3 additions and 8 deletions

View File

@ -1,6 +1,6 @@
{ {
"GIT_SSL_NO_VERIFY" : true, "GIT_SSL_NO_VERIFY" : true,
"working_directory" : "/home/root/szeged/UpdateController", "working_directory" : ".",
"workspace_dir" : "workspace", "workspace_dir" : "workspace",
"customer_location" : "szeged", "customer_location" : "szeged",
"customer_id" : "281", "customer_id" : "281",

View File

@ -48,13 +48,8 @@ read_config() {
log_fatal "$func:${LINENO}: customer_location not set in $1" log_fatal "$func:${LINENO}: customer_location not set in $1"
fi fi
readonly working_directory="$(cat "$1" | jq -r .working_directory)" local workspace="$(cat "$1" | jq -r .workspace_dir)"
log_info "$func:${LINENO}: working_directory is $working_directory" __customer_base_dir="$PWD/${workspace}/${customer_id}/${customer_location}"
readonly workspace_dir="$(cat "$1" | jq -r .workspace_dir)"
local __customer_base_dir="$working_directory/${workspace_dir}"
__customer_base_dir="${__customer_base_dir}/${customer_id}"
__customer_base_dir="${__customer_base_dir}/${customer_location}"
readonly customer_base_dir="${__customer_base_dir}/${zone_group}/${zone}" readonly customer_base_dir="${__customer_base_dir}/${zone_group}/${zone}"
log_info "$func:${LINENO}: customer-base-dir is $customer_base_dir" log_info "$func:${LINENO}: customer-base-dir is $customer_base_dir"