Allow multiple OSes to be checked out with git submodules.

crup-runner.sh

 #!/bin/bash
 
 update_toplevel () {
   # Don't "pull" if checkout is not on a named branch
   if test "$2" = "pull" && ( ! git symbolic-ref HEAD >/dev/null 2>/dev/null ); then
     first_args="$1 fetch"
   else
     first_args="$1 $2"
   fi
   shift 2
   echo "[$solution] $first_args $@" 1>&2
   $first_args $@ | sed "s/^/[$solution] /g" 1>&2
   status=$?
   if [ "$status" -ne 0 ]; then
     exit $status
   fi
 }
 
 set_target_os () {
   # Get the os we're building for.  On first run, this will be unset.
-  target_os=$(git config target.os 2>/dev/null)
+  target_os=$(git config --get-all target.os 2>/dev/null)
   if [ -z "$target_os" ]; then
     case $(uname -s) in
       Linux) target_os=unix ;;
       Darwin) target_os=mac ;;
       CYGWIN*|MINGW*) target_os=win ;;
       *)
         echo "[$solution] *** No target.os set in .git/config, and I can't" 1>&2
         echo "[$solution] *** figure it out from 'uname -s'" 1>&2
         exit 1
         ;;
@@ skipping 16 matching lines @@
   fi
 }
 
 process_submodule () {
   # Check whether this submodule should be ignored or updated.
   # If it's a new submodule, match the os specified in .gitmodules against
   # the os specified in .git/config.
   update_policy=$(git config --get "submodule.$1.update")
   if [ -z "$update_policy" ]; then
     submod_os=$(git config -f .gitmodules --get "submodule.$1.os")
-    if [ -n "$submod_os" -a \
-        "$submod_os" != "all" -a \
-        "${submod_os/${target_os}/}" = "${submod_os}" ]; then
+    if [ -n "$submod_os" -a "$submod_os" != "all" ]; then
       update_policy=none
+      for os in $target_os; do
+        if [ "${submod_os/${os}/}" != "${submod_os}" ]; then
+          update_policy=checkout
+        fi
+      done
     else
+      update_policy=checkout
+    fi
+    if [ "$update_policy" != "none" ]; then
       git submodule --quiet init "$1"
-      update_policy=checkout
     fi
     git config "submodule.$1.update" $update_policy
   fi
   ignore_policy=$(git config --get "submodule.$1.ignore")
   if [ -z "$ignore_policy" ]; then
     git config "submodule.$1.ignore" all
   fi
   if [ "$update_policy" != "none" ]; then
     update_submodule_url "$1"
     echo "$solution/$1"
@@ skipping 38 matching lines @@
   submodule="${1#*/}"
   echo "[$solution] updating $submodule"
   git submodule update --recursive --quiet "$submodule" |
   ( grep -v '^Skipping submodule' || true ) | sed "s|^|[$1] |g" 2>/dev/null
   status=$?
   if [ "$status" -ne "0" ]; then
     echo "[$solution] FAILED to update $submodule"
   fi
 fi
 exit $status