diff --git a/CHANGELOG.md b/CHANGELOG.md index b5bf5be..19c7b89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2021-03-31 Release 1.5.10 +### Summary +Bug Fix + +### Changes + - variables_to_replace did not pass through to sub calls when passed on cli + ## 2020-06-25 Release 1.5.9 ### Summary Security Fix diff --git a/dbdeployer_release b/dbdeployer_release index 40e1bf6..aa0b293 100644 --- a/dbdeployer_release +++ b/dbdeployer_release @@ -1 +1 @@ -version=1.5.9 +version=1.5.10 diff --git a/functions/deployment_report.sh b/functions/deployment_report.sh index 5f6d406..01d134f 100644 --- a/functions/deployment_report.sh +++ b/functions/deployment_report.sh @@ -21,7 +21,7 @@ deployment_report() { do if ! [ -z "${x}" ] then - echo "${script_name} -f "${x}" -n "${db_destination_name}" ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${confirm_cli}" + echo "${script_name} -f ${x} -n ${db_destination_name} -o '${variables_to_replace}' ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${confirm_cli}" let "pending_count++" fi done @@ -81,7 +81,7 @@ deployment_report() { if ! [ -z "${x}" ] then auto_deploy_file=`echo ${x} | awk -F '--dbdeployer-md5sum--' {'print $1'}` - echo "${script_name} -f "${auto_deploy_file}" -c -n "${db_destination_name}" ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}" + echo "${script_name} -f ${auto_deploy_file} -c -n ${db_destination_name} -o '${variables_to_replace}' ${run_as_cli} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli}" let "pending_count++" fi done diff --git a/functions/update_db_to_current.sh b/functions/update_db_to_current.sh index 7c242c3..ee9eb85 100644 --- a/functions/update_db_to_current.sh +++ b/functions/update_db_to_current.sh @@ -6,7 +6,8 @@ function update_db_to_current() { #echo "report_var executes: ${script_name} ${run_as_cli} -D ${db_basedir} -r -d \"${_dbname}\" -n \"${_db_destination_name}\" ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${module_list_cli} ${confirm_cli} | grep \"${script_name} -f\"" - report_var=`${script_name} ${run_as_cli} -D ${db_basedir} -r -d "${_dbname}" -n "${_db_destination_name}" ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${module_list_cli} ${confirm_cli} | grep "${script_name} -f"` + report_var=`${script_name} ${run_as_cli} -D ${db_basedir} -r -d "${_dbname}" -n "${_db_destination_name}" -o ${variables_to_replace} ${environment_flag} ${server_cli} ${port_cli} ${dbuser_cli} ${password_cli} ${skip_cli} ${dbtype_cli} ${module_list_cli} ${confirm_cli} | grep "${script_name} -f"` + local IFS=$'\n' for j in `echo -e "${report_var}"` do