diff --git a/gather.sh b/gather.sh index 0f58026..5d94b7a 100644 --- a/gather.sh +++ b/gather.sh @@ -3,38 +3,30 @@ apk update apk add jq -for i in {1..3}; do - repos=$(curl -s "https://gitlab.com/api/v4/groups/flectra-community/projects?per_page=100&page=${i}") - git config --global merge.ours.driver true - for row in $(echo "${repos}" | jq -r '.[] | @base64'); do - _jq() { - echo ${row} | base64 --decode | jq -r ${1} - } - url=$(_jq '.http_url_to_repo') - name=$(_jq '.name') +for a in 2.0 2.0-upstream 2.0-fixed; do + git checkout ${a} + for i in {1..3}; do + repos=$(curl -s "https://gitlab.com/api/v4/groups/flectra-community/projects?per_page=100&page=${i}") + git config --global merge.ours.driver true + for row in $(echo "${repos}" | jq -r '.[] | @base64'); do + _jq() { + echo ${row} | base64 --decode | jq -r ${1} + } + url=$(_jq '.http_url_to_repo') + name=$(_jq '.name') - echo ${name} - echo ${url} + echo ${name} + echo ${url} - if [ $name != 'l10n_switzerland' ] - then - git remote add $name $url - git fetch $name - git checkout 2.0 - git merge --no-edit --allow-unrelated-histories $name/2.0 - git checkout 2.0-fixed - git merge --no-edit --allow-unrelated-histories $name/2.0-fixed - git checkout 2.0-upstream - git merge --no-edit --allow-unrelated-histories $name/2.0-upstream - git checkout 1.0 - git merge --no-edit --allow-unrelated-histories $name/1.0 - git checkout 1.0-fixed - git merge --no-edit --allow-unrelated-histories $name/1.0-fixed - git checkout 1.0-upstream - git merge --no-edit --allow-unrelated-histories $name/1.0-upstream - git remote remove $name - git gc --prune=now - fi + if [ $name != 'l10n-switzerland' ] + then + git remote add $name $url + git fetch $name + git merge --no-edit --allow-unrelated-histories $name/${a} + git remote remove $name + fi + done done + git gc --prune=now done git push --all \ No newline at end of file