Use a single function for listing submodules

Author: polytypic

.cppsm/testing/hello_and_then_some_test

@@ -10,6 +10,8 @@ cppsm add equipment https://github.com/per-framework/dumpster.cpp.git v1
 cppsm add requires https://github.com/per-framework/dumpster.cpp.git v1
 cppsm add equipment https://github.com/per-framework/dumpster.cpp.git v1
 
+cppsm upgrade
+
 cppsm list
 
 cppsm remove requires/polyfill.cpp/v1

commands/.settings

@@ -23,3 +23,25 @@ if [ -z "$NUMBER_OF_PROCESSORS" ]; then
 fi
 
 N_PARALLEL_UPDATE="${N_PARALLEL_UPDATE:-$NUMBER_OF_PROCESSORS}"
+
+add-submodule-keys-and-paths-to() {
+  local VAR="$1"
+  local GITMODULES="$2"
+  local KIND="$3"
+  shift 3
+  local IFS=$'\n'
+  for LINE in $(git config \
+                    --file "$GITMODULES" \
+                    --get-regexp "^submodule\.($KIND)/.*\.path$" \
+                  | sed "$@"); do
+    eval "$VAR+=('$LINE')"
+  done
+}
+
+add-submodule-paths-to() {
+  add-submodule-keys-and-paths-to "$@" -e 's#^.*\.path ##g'
+}
+
+add-submodule-keys-to() {
+  add-submodule-keys-and-paths-to "$@" -e 's#^submodule\.##g' -e 's#\.path .*$##g'
+}

commands/add

@@ -39,11 +39,11 @@ else
   EXISTING="$DESIRED"
 fi
 
-for SUBMODULE in $(git config \
-                       --file "$EXISTING/.gitmodules" \
-                       --name-only \
-                       --get-regexp '^submodule\.requires/.*\.path$'); do
-  SUBMODULE_URL=$(git config --file "$EXISTING/.gitmodules" --get "${SUBMODULE%.path}.url")
-  SUBMODULE_BRANCH=$(git config --file "$EXISTING/.gitmodules" --get "${SUBMODULE%.path}.branch")
+KEYS=()
+add-submodule-keys-to KEYS "$EXISTING/.gitmodules" requires
+
+for KEY in "${KEYS[@]}"; do
+  SUBMODULE_URL=$(git config --file "$EXISTING/.gitmodules" --get "submodule.$KEY.url")
+  SUBMODULE_BRANCH=$(git config --file "$EXISTING/.gitmodules" --get "submodule.$KEY.branch")
   "$CPPSM/commands/add" "$KIND" "$SUBMODULE_URL" "$SUBMODULE_BRANCH"
 done

commands/list

@@ -24,13 +24,7 @@ tree() {
   local PARENT="$5"
 
   local KEYS=()
-  IFS=$'\n'
-  for KEY in $(git config \
-                   --file "$GITMODULES" \
-                   --name-only \
-                   --get-regexp "^submodule\.($KIND)/.*\.path$"); do
-    KEYS+=("$KEY")
-  done
+  add-submodule-keys-to KEYS "$GITMODULES" "$KIND"
 
   if [ 0 = ${#KEYS[@]} ]; then
     CONNECT='─'
@@ -58,8 +52,6 @@ tree() {
 
   for ((i = 0; i < ${#KEYS[@]}; ++i)); do
     SUB=${KEYS[$i]}
-    SUB="${SUB%.path}"
-    SUB="${SUB#submodule.}"
 
     KEY="${SUB#*/}"
 

commands/update

@@ -17,11 +17,6 @@ fi
 git pull "${GIT_QUIET[@]}" --rebase
 
 MODULES=(.cppsm)
-while IFS='' read -r line; do
-  MODULES+=("$line")
-done < <(git config \
-             --file .gitmodules \
-             --get-regexp "^submodule\.(equipment|requires)/.*\.path$" \
-           | sed -e 's#^.*\.path ##g')
+add-submodule-paths-to MODULES .gitmodules 'equipment|requires'
 
 git submodule "${GIT_QUIET[@]}" update --jobs "$N_PARALLEL_UPDATE" --init -- "${MODULES[@]}"

commands/upgrade

@@ -15,12 +15,7 @@ EOF
 fi
 
 MODULES=(.cppsm)
-while IFS='' read -r line; do
-  MODULES+=("$line")
-done < <(git config \
-             --file .gitmodules \
-             --get-regexp "^submodule\.(equipment|requires)/.*\.path$" \
-           | sed -e 's#^.*\.path ##g')
+add-submodule-paths-to MODULES .gitmodules 'equipment|requires'
 
 git submodule "${GIT_QUIET[@]}" update --jobs "$N_PARALLEL_UPDATE" --remote -- "${MODULES[@]}"
 git add "${MODULES[@]}"