From f75acae4d58a99c2ff3a3259b04d13bea66d606f Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Wed, 9 Mar 2022 20:54:06 -0700
Subject: [PATCH] Only running each import once.

---
 scripts/ubuntu_20.04_install_map.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/ubuntu_20.04_install_map.sh b/scripts/ubuntu_20.04_install_map.sh
index 85cbb316..5677f34f 100755
--- a/scripts/ubuntu_20.04_install_map.sh
+++ b/scripts/ubuntu_20.04_install_map.sh
@@ -55,14 +55,20 @@ set +e
 MAX_TRIES=3
 COUNT=0
 SUCCESS=false
+dc_import=false
+indexes=false
+external_data=false
 while [ "${COUNT}" -lt "${MAX_TRIES}" ]; do
-  sudo -u wrolpi /bin/bash /opt/wrolpi/scripts/import_map.sh /tmp/district-of-columbia-latest.osm.pbf
-  dc_import=$?
-  sudo -u wrolpi psql -d gis -f /opt/openstreetmap-carto/indexes.sql
-  indexes=$?
-  sudo -u wrolpi /opt/openstreetmap-carto/scripts/get-external-data.py -d gis -U wrolpi
-  external_data=$?
-  if [[ "${dc_import}" == 0 && "${indexes}" == 0 && "${external_data}" == 0 ]]; then
+  [[ "${dc_import}" = false ]] &&
+    sudo -u wrolpi /bin/bash /opt/wrolpi/scripts/import_map.sh /tmp/district-of-columbia-latest.osm.pbf &&
+    dc_import=true
+  [[ "${indexes}" = false ]] &&
+    sudo -u wrolpi psql -d gis -f /opt/openstreetmap-carto/indexes.sql &&
+    indexes=true
+  [[ "${external_data}" = false ]] &&
+    sudo -u wrolpi /opt/openstreetmap-carto/scripts/get-external-data.py -d gis -U wrolpi &&
+    external_data=true
+  if [[ "${dc_import}" == true && "${indexes}" == true && "${external_data}" == true ]]; then
     SUCCESS=true
     break
   fi