From ad7e68367facccffb86868438fcecee93b2c9f1b Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Wed, 16 Nov 2022 18:55:50 -0700
Subject: [PATCH] Changing /opt/openstreetmap-carto ownership before fetching
 during install.

---
 scripts/install_map_debian_11.sh    | 2 +-
 scripts/install_map_ubuntu_20.04.sh | 2 +-
 wrolpi/version.py                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install_map_debian_11.sh b/scripts/install_map_debian_11.sh
index 7d988089..9477358d 100755
--- a/scripts/install_map_debian_11.sh
+++ b/scripts/install_map_debian_11.sh
@@ -35,8 +35,8 @@ chmod +x /etc/init.d/renderd
 # Initialize gis database.
 [ -d /opt/openstreetmap-carto ] && chown -R wrolpi:wrolpi /opt/openstreetmap-carto
 git clone https://github.com/lrnselfreliance/openstreetmap-carto.git /opt/openstreetmap-carto || :
-sudo -u wrolpi /bin/bash -c '(cd /opt/openstreetmap-carto && git fetch && git checkout master && git reset --hard origin/master && git pull --ff)'
 chown -R wrolpi:wrolpi /opt/openstreetmap-carto
+sudo -u wrolpi /bin/bash -c '(cd /opt/openstreetmap-carto && git fetch && git checkout master && git reset --hard origin/master && git pull --ff)'
 cd /opt/openstreetmap-carto
 if [[ ! -f /opt/openstreetmap-carto/mapnik.xml || ! -s /opt/openstreetmap-carto/mapnik.xml ]]; then
   /usr/local/bin/carto project.mml >/opt/openstreetmap-carto/mapnik.xml
diff --git a/scripts/install_map_ubuntu_20.04.sh b/scripts/install_map_ubuntu_20.04.sh
index f4a62f17..315adffd 100755
--- a/scripts/install_map_ubuntu_20.04.sh
+++ b/scripts/install_map_ubuntu_20.04.sh
@@ -52,8 +52,8 @@ chown wrolpi /var/lib/mod_tile
 # Initialize gis database.
 [ -d /opt/openstreetmap-carto ] && chown -R wrolpi:wrolpi /opt/openstreetmap-carto
 git clone https://github.com/lrnselfreliance/openstreetmap-carto.git /opt/openstreetmap-carto || :
-sudo -u wrolpi /bin/bash -c '(cd /opt/openstreetmap-carto && git fetch && git checkout master && git reset --hard origin/master && git pull --ff)'
 chown -R wrolpi:wrolpi /opt/openstreetmap-carto
+sudo -u wrolpi /bin/bash -c '(cd /opt/openstreetmap-carto && git fetch && git checkout master && git reset --hard origin/master && git pull --ff)'
 cd /opt/openstreetmap-carto
 if [[ ! -f /opt/openstreetmap-carto/mapnik.xml || ! -s /opt/openstreetmap-carto/mapnik.xml ]]; then
   /usr/bin/carto project.mml >/opt/openstreetmap-carto/mapnik.xml
diff --git a/wrolpi/version.py b/wrolpi/version.py
index 1bc3a5db..85c08194 100644
--- a/wrolpi/version.py
+++ b/wrolpi/version.py
@@ -1,4 +1,4 @@
-__version__ = '0.7.3-beta'
+__version__ = '0.7.4-beta'
 
 import subprocess