Don't clutter output of usage instructions

Fix erroneous quotes around WGET_ARGS (fixes #210 )
Use indexes.sql included with openstreetmap-carto instead of own copy (fixes #204 ) (#205 )
2021-09-03 12:51:45 +02:00 · 2021-09-03 12:46:37 +02:00 · 2021-07-19 22:05:18 +02:00
1 changed files with 4 additions and 4 deletions
@@ -1,7 +1,5 @@
 #!/bin/bash

-set -x
-
 function createPostgresConfig() {
  cp /etc/postgresql/12/main/postgresql.custom.conf.tmpl /etc/postgresql/12/main/conf.d/postgresql.custom.conf
  sudo -u postgres echo "autovacuum = $AUTOVACUUM" >> /etc/postgresql/12/main/conf.d/postgresql.custom.conf
@@ -23,6 +21,8 @@ if [ "$#" -ne 1 ]; then
    exit 1
 fi

+set -x
+
 if [ "$1" = "import" ]; then
    # Ensure that database directory is in right state
    chown postgres:postgres -R /var/lib/postgresql
@@ -50,10 +50,10 @@ if [ "$1" = "import" ]; then

    if [ -n "$DOWNLOAD_PBF" ]; then
        echo "INFO: Download PBF file: $DOWNLOAD_PBF"
-        wget "$WGET_ARGS" "$DOWNLOAD_PBF" -O /data.osm.pbf
+        wget $WGET_ARGS "$DOWNLOAD_PBF" -O /data.osm.pbf
        if [ -n "$DOWNLOAD_POLY" ]; then
            echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY"
-            wget "$WGET_ARGS" "$DOWNLOAD_POLY" -O /data.poly
+            wget $WGET_ARGS "$DOWNLOAD_POLY" -O /data.poly
        fi
    fi
Author	SHA1	Message	Date
Alexander Overvoorde	60ac7657d1	Don't clutter output of usage instructions	2021-09-03 12:51:45 +02:00
Alexander Overvoorde	ce176ae32e	Fix erroneous quotes around WGET_ARGS (fixes #210 )	2021-09-03 12:46:37 +02:00
Alexander Overvoorde	7b82bcae9d	Use indexes.sql included with openstreetmap-carto instead of own copy (fixes #204 ) (#205 )	2021-07-19 22:05:18 +02:00