Fixing upgrade which deletes the wrong map blob. Fixing the port so t…

…he old map database is deleted.
lrnselfreliance · Jan 12, 2025 · bd599e1 · bd599e1
1 parent cef4335
commit bd599e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/scripts/reset_map.sh b/scripts/reset_map.sh
@@ -28,8 +28,8 @@ set -x
 systemctl stop renderd
 
 # Delete old map database, if it exists.
-sudo -iu postgres dropdb --port=5433 gis || :
-sudo -iu postgres dropuser --port=5433 _renderd || :
+sudo -iu postgres dropdb --port=5432 gis || :
+sudo -iu postgres dropuser --port=5432 _renderd || :
 # Delete new map database, it will be created again.
 sudo -iu postgres dropdb --port=5433 gis || :
 sudo -iu postgres dropuser --port=5433 _renderd || :

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
@@ -24,7 +24,7 @@ if [[ ! -f ${MAP_DB_BLOB} || ! -s ${MAP_DB_BLOB} ]]; then
 fi
 if [[ -f /opt/wrolpi-blobs/gis-map.dump.gz && -s ${MAP_DB_BLOB} ]]; then
   # Remove old blob now that we have the new one.
-  rm ${MAP_DB_BLOB}
+  rm /opt/wrolpi-blobs/gis-map.dump.gz
 fi
 
 # Migrate map DB if necessary.  Do this before repair because it will reset map if map db is empty.

diff --git a/wrolpi/version.txt b/wrolpi/version.txt
@@ -1 +1 @@
-0.15.1-beta
+0.15.2-beta