From bd599e1b2b9d8895c9d8e18d39d5056a8b85ee9b Mon Sep 17 00:00:00 2001 From: Roland Date: Sun, 12 Jan 2025 11:05:43 -0700 Subject: [PATCH] Fixing upgrade which deletes the wrong map blob. Fixing the port so the old map database is deleted. --- scripts/reset_map.sh | 4 ++-- scripts/upgrade.sh | 2 +- wrolpi/version.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/reset_map.sh b/scripts/reset_map.sh index 336439a3..f75b1dea 100755 --- 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 index baeb8939..f509c3e2 100755 --- 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 index d28fffee..2f3f9910 100644 --- a/wrolpi/version.txt +++ b/wrolpi/version.txt @@ -1 +1 @@ -0.15.1-beta \ No newline at end of file +0.15.2-beta \ No newline at end of file