Handle planet updates that need multiple passes correctly

diff --git a/cookbooks/cplanet/templates/default/update-planet.erb b/cookbooks/cplanet/templates/default/update-planet.erb
index e992c35788ca176f9bd2fc2bf1dd38c795784a8f..6c77eafa60e8a50436cce73a513316a6ed98b6fa 100644 (file)
--- a/cookbooks/cplanet/templates/default/update-planet.erb
+++ b/cookbooks/cplanet/templates/default/update-planet.erb
@@ -8,11 +8,16 @@ PLANETDIR="<%= @basedir %>/planet"
 PLANETPREV="${PLANETDIR}/planet-previous.pbf"
 PLANETCURR="${PLANETDIR}/planet.pbf"
 PLANETNEW="${PLANETDIR}/planet-new.pbf"
 PLANETPREV="${PLANETDIR}/planet-previous.pbf"
 PLANETCURR="${PLANETDIR}/planet.pbf"
 PLANETNEW="${PLANETDIR}/planet-new.pbf"

+PLANETTMP="${PLANETDIR}/planet-tmp.pbf"
+
+pyosmium-up-to-date -v -o $PLANETNEW $PLANETCURR
+retval=$?

 
 

-retval=1

 while [ $retval -eq 1 ]; do
 while [ $retval -eq 1 ]; do

-    pyosmium-up-to-date -v -o $PLANETNEW $PLANETCURR
+    mv "$PLANETNEW" "$PLANETTMP"
+    pyosmium-up-to-date -v -o $PLANETNEW $PLANETTMP

     retval=$?
     retval=$?

+    rm "$PLANETTMP"

 done
 
 if [ $retval -ne 0 ]; then
 done
 
 if [ $retval -ne 0 ]; then