openstack/openstack-ansible
Code Issues Proposed changes

scripts: sources-branch-updater-lib.sh: Avoid using 'dirname $0'

Browse Source 
Since this library can be sourced by external scripts, 'dirname $0'
can't be used reliably to determine where the rest of the OSA helper
scripts are located since $0 points to the external script.
It's best to use the BASH_SOURCE array to determine the file in which
the current function is defined.

Change-Id: If48ee9cb472de811076d7d3adec8f3c9b476b833
This commit is contained in:
Markos Chandras 2017-06-15 12:18:42 +01:00
parent e9ef150728
commit 5f301976dc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/sources-branch-updater-lib.sh
View File

@ -207,9 +207,11 @@ update_pip_options() {
# Updates ansible-role-requirements file SHAs
#
update_ansible_role_requirements() {
local role_name role_version osa_repo_tmp_path role_git_sources
local role_name role_version osa_repo_tmp_path role_git_sources current_source_dir
local osa_branch=${1}
local pre_release=${2}
current_source_dir="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
# Update the ansible-role-requirements.yml file
# We don't want to be doing this for the master branch
if [ "${osa_branch}" != "master" ] || [ "${pre_release}" == "true" ]; then
@ -253,7 +255,7 @@ update_ansible_role_requirements() {
fi
# Now use the information we have to update the ansible-role-requirements file
"$(dirname "${0}")/ansible-role-requirements-editor.py" -f ansible-role-requirements.yml -n "${role_name}" -v "${role_version}"
"$current_source_dir/ansible-role-requirements-editor.py" -f ansible-role-requirements.yml -n "${role_name}" -v "${role_version}"
unset role_version
done