command=$1
shift
-modules="$@"
+maybe_modules="$@"
test -z "$GIT" && GIT=git
echo "Alternatively you may disable automatic GIT submodule checkout"
echo "with:"
echo
- echo " $ ./configure --disable-git-update'"
+ echo " $ ./configure --disable-git-update"
echo
echo "and then manually update submodules prior to running make, with:"
echo
- echo " $ scripts/git-sbumodule.sh update $modules"
+ echo " $ scripts/git-submodule.sh update $modules"
echo
exit 1
}
-if test -z "$modules"
-then
- test -e $substat || touch $substat
- exit 0
-fi
+modules=""
+for m in $maybe_modules
+do
+ $GIT submodule status $m 1> /dev/null 2>&1
+ if test $? = 0
+ then
+ modules="$modules $m"
+ else
+ echo "warn: ignoring non-existent submodule $m"
+ fi
+done
-if ! test -e ".git"
+if test -n "$maybe_modules" && ! test -e ".git"
then
echo "$0: unexpectedly called with submodules but no git checkout exists"
exit 1
case "$command" in
status)
+ if test -z "$maybe_modules"
+ then
+ test -s ${substat} && exit 1 || exit 0
+ fi
+
test -f "$substat" || exit 1
- CURSTATUS=`$GIT submodule status $modules`
- OLDSTATUS=`cat $substat`
+ CURSTATUS=$($GIT submodule status $modules)
+ OLDSTATUS=$(cat $substat)
test "$CURSTATUS" = "$OLDSTATUS"
exit $?
;;
update)
+ if test -z "$maybe_modules"
+ then
+ test -e $substat || touch $substat
+ exit 0
+ fi
+
$GIT submodule update --init $modules 1>/dev/null
test $? -ne 0 && error "failed to update modules"