diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-03-02 23:26:52 +0100 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-03-02 23:26:52 +0100 |
| commit | 1f6e1555f28e81e63ab0f3d213207975d75892f6 (patch) | |
| tree | 4db15f92c21e619d17d8333f0cc2d33dca156313 | |
| parent | 952200044d4078cbc5f45e4cd9228347c57e80b9 (diff) | |
| download | zsh-1f6e1555f28e81e63ab0f3d213207975d75892f6.tar.gz zsh-1f6e1555f28e81e63ab0f3d213207975d75892f6.tar.bz2 zsh-1f6e1555f28e81e63ab0f3d213207975d75892f6.zip | |
Clean up jira function
| -rw-r--r-- | plugins/jira/jira.plugin.zsh | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh index 9e7cf2b88..ed88368cd 100644 --- a/plugins/jira/jira.plugin.zsh +++ b/plugins/jira/jira.plugin.zsh @@ -63,19 +63,24 @@ function jira() { else # Anything that doesn't match a special action is considered an issue name # but `branch` is a special case that will parse the current git branch + local issue_arg issue if [[ "$action" == "branch" ]]; then - local issue_arg=$(git rev-parse --abbrev-ref HEAD) - issue_arg=($(echo $issue_arg | cut -d'_' -f1)) - if [[ $(echo ${issue_arg} | grep ${jira_prefix}) ]]; then - local issue="${issue_arg}" + # Get name of the branch + issue_arg=$(git rev-parse --abbrev-ref HEAD) + # Split by _ character and get the first element + issue_arg=(${(s:_:)issue_arg}) + issue_arg=${issue_arg[1]} + if [[ "$issue_arg" = ${jira_prefix}* ]]; then + issue="${issue_arg}" else - local issue="${jira_prefix}${issue_arg}" + issue="${jira_prefix}${issue_arg}" fi else - local issue_arg=${(U)action} - local issue="${jira_prefix}${issue_arg}" + issue_arg=${(U)action} + issue="${jira_prefix}${issue_arg}" fi - local url_fragment='' + + local url_fragment if [[ "$2" == "m" ]]; then url_fragment="#add-comment" echo "Add comment to issue #$issue" |