Do submodule update and upgrade operations in parallel

Author: polytypic

commands/.settings

@@ -17,3 +17,5 @@ if [ "$GIT_QUIET" = 0 ]; then
 else
   GIT_QUIET=(--quiet)
 fi
+
+N_PARALLEL_UPDATE="${N_PARALLEL_UPDATE:-$NUMBER_OF_PROCESSORS}"

commands/clone

@@ -16,8 +16,6 @@ fi
 NAME="${1%.git}"
 NAME="${NAME##*/}"
 
-N_PARALLEL_UPDATE="${N_PARALLEL_UPDATE:-$NUMBER_OF_PROCESSORS}"
-
 git clone "${GIT_QUIET[@]}" --branch "$2" "$1"
 cd "$NAME"
 git submodule "${GIT_QUIET[@]}" update --init --jobs "$N_PARALLEL_UPDATE"

commands/update

@@ -16,18 +16,12 @@ fi
 
 git pull "${GIT_QUIET[@]}" --rebase
 
-update-by-key () {
-  local KEY="$1"
-  local DIR
-  DIR="$(git config --file .gitmodules --get "$KEY")"
-  git submodule "${GIT_QUIET[@]}" update --init -- "$DIR"
-}
+MODULES=()
+while IFS='' read -r line; do
+  MODULES+=("$line")
+done < <(git config \
+             --file .gitmodules \
+             --get-regexp "^submodule\.(equipment|requires)/.*\.path$" \
+           | sed -e 's#^.*\.path ##g')
 
-for KEY in $(git config \
-                 --file .gitmodules \
-                 --name-only \
-                 --get-regexp "^submodule\.(equipment|requires)/.*\.path$"); do
-  update-by-key "$KEY"
-done
-
-update-by-key "submodule..cppsm.path"
+git submodule "${GIT_QUIET[@]}" update --jobs "$N_PARALLEL_UPDATE" --init -- "${MODULES[@]}"

commands/upgrade

@@ -14,21 +14,15 @@ EOF
   exit 1
 fi
 
-upgrade-by-key () {
-  local KEY="$1"
-  local DIR
-  DIR="$(git config --file .gitmodules --get "$KEY")"
-  git submodule "${GIT_QUIET[@]}" update --remote -- "$DIR"
-  git add "$DIR"
-}
+MODULES=()
+while IFS='' read -r line; do
+  MODULES+=("$line")
+done < <(git config \
+             --file .gitmodules \
+             --get-regexp "^submodule\.(equipment|requires)/.*\.path$" \
+           | sed -e 's#^.*\.path ##g')
 
-for KEY in $(git config \
-                 --file .gitmodules \
-                 --name-only \
-                 --get-regexp "^submodule\.(equipment|requires)/.*\.path$"); do
-  upgrade-by-key "$KEY"
-done
-
-upgrade-by-key "submodule..cppsm.path"
+git submodule "${GIT_QUIET[@]}" update --jobs "$N_PARALLEL_UPDATE" --remote -- "${MODULES[@]}"
+git add "${MODULES[@]}"
 
 "$CPPSM/commands/init"

travis-ci

@@ -55,7 +55,6 @@ folded() {
   echo -e "\ntravis_fold:end:cppsm.$FOLD\r"
 }
 
-N_PARALLEL_UPDATE="${N_PARALLEL_UPDATE:-$NUMBER_OF_PROCESSORS}"
 folded ... concurrently GIT_UPDATE_PID git submodule update --init --depth 1 --jobs "$N_PARALLEL_UPDATE"
 
 if [ "$TRAVIS_OS_NAME" = linux ]; then