From 82fa38ec298e7ab145e46e356650edc3e6074f29 Mon Sep 17 00:00:00 2001
From: Simson Garfinkel <simsong@acm.org>
Date: Sat, 27 Jan 2024 14:44:00 -0500
Subject: [PATCH 1/3] add extra help

---
 bootstrap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 12ac798d..3d667b4d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -7,7 +7,8 @@ mkdir -p build-aux
 for sub in be20_api be20_api/dfxml_cpp
 do
   if [ ! -r src/$sub/.git ] ;  then
-    echo submodule $sub is not present.
+      echo submodule $sub is not present.
+      echo When you did your original \'git pull\', did you remember to include the --recursive flag\?
     exit 1
   fi
 done

From 1cde4d522cf4c5cb49903882aea44fc292193c74 Mon Sep 17 00:00:00 2001
From: Simson Garfinkel <simsong@acm.org>
Date: Sat, 27 Jan 2024 18:59:10 -0500
Subject: [PATCH 2/3] cleaner quoting

---
 bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 3d667b4d..c9e9f155 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -8,7 +8,7 @@ for sub in be20_api be20_api/dfxml_cpp
 do
   if [ ! -r src/$sub/.git ] ;  then
       echo submodule $sub is not present.
-      echo When you did your original \'git pull\', did you remember to include the --recursive flag\?
+      echo 'When you did your original "git pull", did you remember to include the --recursive flag?'
     exit 1
   fi
 done

From 9bdb85bfd062c0006b28aa544f72455fbe2b6d64 Mon Sep 17 00:00:00 2001
From: Simson Garfinkel <simsong@acm.org>
Date: Sun, 28 Jan 2024 09:26:22 -0500
Subject: [PATCH 3/3] make bootstrap more friendly

---
 bootstrap.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index c9e9f155..ce979b91 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,15 +1,19 @@
 #!/bin/sh
-# Make sure it was checked out with git clone --recursive ...
-# If not, update the submodules
 
 mkdir -p build-aux
 
-for sub in be20_api be20_api/dfxml_cpp
+# Make sure it was checked out with git clone --recursive ...
+# If not, try to fix it. dfxml_schema is there twice to verify that the checkout worked
+
+for sub in dfxml_schema dfxml_schema src/be20_api src/be20_api/dfxml_cpp src/be20_api/utfcpp src/be20_api/utfcpp/extern/ftest
 do
-  if [ ! -r src/$sub/.git ] ;  then
+  if [ ! -r $sub/.git ] ;  then
       echo submodule $sub is not present.
-      echo 'When you did your original "git pull", did you remember to include the --recursive flag?'
-    exit 1
+      echo 'When you did your original "git pull", you likely did not include the --recursive flag.'
+      echo 'Attempting to fix...'
+      git submodule init
+      git submodule update
+      git submodule foreach --recursive 'git submodule init;git submodule update'
   fi
 done