diff --git a/README.md b/README.md index 4bb341e..bf5ae82 100644 --- a/README.md +++ b/README.md @@ -16,5 +16,5 @@ url=http://$(cat forgejo-ip):3000 firefox $url tests/run.sh --debug tests/run.sh --debug create_pull_request -cascading-pr.sh --debug --origin-url "$url" --origin-repo "user1/originrepo" --origin-token "$(cat /tmp/cascading-pr/user1/token)" --origin-pr 1 --destination-url "$url" --destination-repo "user2/destinationrepo" --destination-token "$(cat /tmp/cascading-pr/user2/token)" --destination-branch "main" --update "upgraded" +cascading-pr.sh --debug --origin-url "$url" --origin-repo "user1/originrepo" --origin-token "$(cat /tmp/cascading-pr-test/user1/token)" --origin-pr 1 --destination-url "$url" --destination-repo "user2/destinationrepo" --destination-token "$(cat /tmp/cascading-pr-test/user2/token)" --destination-branch "main" --update "upgraded" ``` diff --git a/cascading-pr.sh b/cascading-pr.sh index 349f541..e762fee 100755 --- a/cascading-pr.sh +++ b/cascading-pr.sh @@ -26,24 +26,24 @@ function repo_curl() { function upsert_branch() { local repo_api=${options[destination_url]}/api/v1/repos/${options[destination_repo]} - if forgejo-curl.sh api_json $repo_api/branches/${options[destination_head]} >& /dev/null ; then + if repo_curl ${options[destination_repo]} api_json $repo_api/branches/${options[destination_head]} >& /dev/null ; then log_info "branch ${options[destination_head]} already exists" return fi - forgejo-curl.sh api_json --data-raw '{"new_branch_name":"'${options[destination_head]}'","old_branch_name":"'${options[destination_base]}'"}' $repo_api/branches + repo_curl ${options[destination_repo]} api_json --data-raw '{"new_branch_name":"'${options[destination_head]}'","old_branch_name":"'${options[destination_base]}'"}' $repo_api/branches log_info "branch ${options[destination_head]} created" } function upsert_pr() { local repo_api=${options[destination_url]}/api/v1/repos/${options[destination_repo]} local title="cascading-pr from ${options[origin_url]}/${options[origin_repo]}/pulls/${options[origin_pr]}" - forgejo-curl.sh api --get --data state=open --data type=pulls --data-urlencode q="$title" $repo_api/issues | jq --raw-output .[0] > $TMPDIR/pr.json + repo_curl ${options[destination_repo]} api --get --data state=open --data type=pulls --data-urlencode q="$title" $repo_api/issues | jq --raw-output .[0] > $TMPDIR/pr.json url=$(jq --raw-output .url < $TMPDIR/pr.json) if test "$url" != "null"; then log_info "PR already exists $url" return fi - forgejo-curl.sh api_json --data-raw '{"title":"'"$title"'","base":"'${options[destination_base]}'","head":"'${options[destination_head]}'"}' $repo_api/pulls > $TMPDIR/pr.json + repo_curl ${options[destination_repo]} api_json --data-raw '{"title":"'"$title"'","base":"'${options[destination_base]}'","head":"'${options[destination_head]}'"}' $repo_api/pulls > $TMPDIR/pr.json url=$(jq --raw-output .url < $TMPDIR/pr.json) log_info "PR created $url" }