diff --git a/cascading-pr.sh b/cascading-pr.sh index 92bf539..2d8a8e6 100755 --- a/cascading-pr.sh +++ b/cascading-pr.sh @@ -11,11 +11,12 @@ source $SELF_DIR/cascading-pr-lib.sh trap "rm -fr $TMPDIR" EXIT function repo_login() { - local repo="$1" + local direction="$1" + local repo=${options[${direction}_repo]} ( export DOT=$TMPDIR/$repo forgejo-curl.sh logout - forgejo-curl.sh --token "${options[destination_token]}" login "${options[destination_url]}" + forgejo-curl.sh --token "${options[${direction}_token]}" login "${options[${direction}_url]}" ) } @@ -250,13 +251,13 @@ function run() { case "$state" in open) log_info "PR is open, update or create the cascade branch and PR" - repo_login ${options[destination_repo]} + repo_login destination upsert_destination_branch update local sha=$(sha_pushed destination) if test "$sha" ; then upsert_destination_pr - repo_login ${options[origin_repo]} + repo_login origin comment_origin_pr wait_destination_ci "$sha" fi @@ -265,18 +266,18 @@ function run() { if "$(pr_merged origin)"; then if "${options[close_merge]}" ; then log_info "PR is merged, close the cascade PR and remove the branch" - repo_login ${options[destination_repo]} + repo_login destination close_pr else log_info "PR was merged, update the cascade PR" - repo_login ${options[destination_repo]} + repo_login destination pr_get origin pr_get destination update fi else log_info "PR is closed, close the cascade PR and remove the branch" - repo_login ${options[destination_repo]} + repo_login destination close_pr fi ;;