diff --git a/bin/download b/bin/download index 9972ef5c0123dcc7c81f09cf0900065f068a278e..cf710e9fb907c8e4b0c5e667299475f93081bad9 100755 --- a/bin/download +++ b/bin/download @@ -91,15 +91,28 @@ else # shellcheck disable=SC2001 path="$(echo "$path" | sed -e 's,\..*,,g')" gitlab 200 GET "projects?archived=0&search_namespaces=1&search=$path" - PRJID=$(echo "$result" | jq -r .[0]."id") - if [[ "a${PRJID}a" == "aa" ]]; then - echo "No project found" - exit 6 - fi - if [[ $(isNumeric "$PRJID") -eq 1 ]]; then - echo "Can not find project ID" - exit 6 - fi + i=0 + while true + do + NAMESPACE=$(echo "$result" | jq -r .[$i]."path_with_namespace") + if [[ "$NAMESPACE" == "$path" ]]; then + PRJID=$(echo "$result" | jq -r .[$i]."id") + if [[ "a${PRJID}a" == "aa" ]]; then + echo "No project found" + exit 6 + fi + if [[ $(isNumeric "$PRJID") -eq 1 ]]; then + echo "Can not find project ID" + exit 6 + fi + break + fi + if [[ "a${NAMESPACE}a" == "aa" ]]; then + echo "No project found" + exit 6 + fi + ((i=i+1)) + done fi echo "Find pipeline trigger token ..." diff --git a/bin/merge b/bin/merge index 013985aa7618f5043380a3469c10450c338cf080..a08c23c3189fc4adf31f02482f95b7928c344cd7 100755 --- a/bin/merge +++ b/bin/merge @@ -94,15 +94,28 @@ else # shellcheck disable=SC2001 path="$(echo "$path" | sed -e 's,\..*,,g')" gitlab 200 GET "projects?search_namespaces=1&search=$path" - PRJID=$(echo "$result" | jq -r .[0]."id") - if [[ "a${PRJID}a" == "aa" ]]; then - echo "No project found" - exit 6 - fi - if [[ $(isNumeric "$PRJID") -eq 1 ]]; then - echo "Can not find project ID" - exit 6 - fi + i=0 + while true + do + NAMESPACE=$(echo "$result" | jq -r .[$i]."path_with_namespace") + if [[ "$NAMESPACE" == "$path" ]]; then + PRJID=$(echo "$result" | jq -r .[$i]."id") + if [[ "a${PRJID}a" == "aa" ]]; then + echo "No project found" + exit 6 + fi + if [[ $(isNumeric "$PRJID") -eq 1 ]]; then + echo "Can not find project ID" + exit 6 + fi + break + fi + if [[ "a${NAMESPACE}a" == "aa" ]]; then + echo "No project found" + exit 6 + fi + ((i=i+1)) + done fi echo "Create merge request ..."