make services-to-main.sh more compatible (#6332)

This commit is contained in:
peb-adr 2022-01-18 20:46:13 +01:00 committed by GitHub
parent 7b24b3db36
commit d54499f633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
function get_upstream_branch { function get_upstream_branch {
local BRANCH_NAME=main local BRANCH_NAME=main
local exists=`git show-ref refs/heads/$BRANCH_NAME` local exists=`git show-ref refs/heads/$BRANCH_NAME`
@ -18,10 +20,6 @@ function get_upstream_name {
} }
function pull_latest_commit { function pull_latest_commit {
local SUBMODULE_NAME=$0
echo ""
echo "$SUBMODULE_NAME"
local BRANCH_NAME=$(get_upstream_branch) local BRANCH_NAME=$(get_upstream_branch)
local REMOTE_NAME=$(get_upstream_name) local REMOTE_NAME=$(get_upstream_name)
@ -34,7 +32,14 @@ export -f pull_latest_commit
export -f get_upstream_branch export -f get_upstream_branch
export -f get_upstream_name export -f get_upstream_name
git submodule foreach -q --recursive "bash -c pull_latest_commit \$name" for mod in $(git submodule status | awk '{print $2}'); do
(
echo ""
echo "$mod"
cd "$mod"
pull_latest_commit "$mod"
)
done
echo "" echo ""
echo "Successfully updated all submodules to latest commit." echo "Successfully updated all submodules to latest commit."