diff --git a/Makefile b/Makefile index b90204e..5b7c164 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,9 @@ lib/%: .FORCE --eval '(borg-build "$(@F)")' $(SUPPRESS_WARNINGS) bootstrap: - git submodule init - bin/borg-bootstrap - make build + @printf "\n=== Running 'git submodule init' ===\n\n" + @git submodule init + @printf "\n=== Running 'bin/borg-bootstrap' ===\n" + @bin/borg-bootstrap + @printf "\n=== Running 'make build' ===\n\n" + @make build diff --git a/bin/borg-bootstrap b/bin/borg-bootstrap index 669b623..9af1f95 100755 --- a/bin/borg-bootstrap +++ b/bin/borg-bootstrap @@ -42,12 +42,16 @@ push_remote=$(git config -f .gitmodules borg.pushDefault) git submodule--helper list | while read mode sha1 stage path do - name=$(git submodule--helper name "$path") - url=$(git config -f .gitmodules submodule."$name".url) - if test -e "$path" && ! test -e "$path"/.git then - git submodule--helper clone --name "$name" --path "$path" --url "$url" + name=$(git submodule--helper name "$path") + + echo "\n--- [$name] ---\n" + + git submodule--helper clone \ + --name "$name" \ + --path "$path" \ + --url $(git config -f .gitmodules submodule."$name".url) git config -f .gitmodules --get-all submodule."$name".remote | while read remote remote_url