diff --git a/.helpers.d/ansible.sh b/.helpers.d/ansible.sh index 9afa3f2..9b2ad01 100644 --- a/.helpers.d/ansible.sh +++ b/.helpers.d/ansible.sh @@ -17,6 +17,12 @@ function deploy # [...extra] if [[ "${repo}" = "web" ]]; then repo_folder="${RUN_ROOT}/runnable-angular" fi + if [[ "${repo}" = "api-core" ]]; then + repo_folder="${RUN_ROOT}/api" + fi + if [[ "${repo}" = "api-core" ]]; then + repo_folder="${RUN_ROOT}/api" + fi if [[ "${tag}" = "" ]]; then echo "no tag passed, looking for latest commit" @@ -26,7 +32,12 @@ function deploy # [...extra] fi echo ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}" - ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}" + if [[ $(which noti) == "" ]]; then + (cd $ANSIBLE_ROOT && ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}") + else + (cd $ANSIBLE_ROOT && noti ansible-playbook -i "${ANSIBLE_ROOT}/${tenv}" --vault-password-file ~/.vaultpass -e git_branch="${tag}" "${deployFile}" -t deploy "${@}") + fi + } _deploy() diff --git a/.helpers.d/big-poppa.sh b/.helpers.d/big-poppa.sh index a284ee1..8fd4f6c 100644 --- a/.helpers.d/big-poppa.sh +++ b/.helpers.d/big-poppa.sh @@ -39,7 +39,7 @@ function big_poppa # environment organization/user id/githubid/name value url="${url}/?${field}=${value}" fi - ssh $host curl -sS $url | python -m json.tool + ssh $host curl -sS $url | python -m json.tool | pygmentize -l javascript } _bp_autocompletion()