Update start.sh file for taginfo

Author: Rub21

images/taginfo/start.sh

@@ -6,8 +6,7 @@ UPDATE_DIR=$DATA_DIR/update
 DOWNLOAD_DIR=$DATA_DIR/download
 
 set_taginfo_config() {
-    echo "Setting up $WORKDIR/taginfo-config.json file ..."
-
+    echo "Setting up...$WORKDIR/taginfo-config.json"
     # Update dir values in taginfo-config.json
     grep -v '^ *//' $WORKDIR/taginfo/taginfo-config-example.json |
         jq '.logging.directory                   = "'$UPDATE_DIR'/log"' |
@@ -27,7 +26,7 @@ set_taginfo_config() {
     [[ ! -z $INSTANCE_CONTACT+z} ]] && jq --arg a "${INSTANCE_CONTACT}" '.instance.contact = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
 
     # languages wiki databases will be downloaded from OSM
-    jq --arg a "languages wiki" '.sources.download = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
+    [[ ! -z $DOWNLOAD_DB+z} ]] && jq --arg a "${DOWNLOAD_DB}" '.sources.download = $a' $WORKDIR/taginfo-config.json >tmp.json && mv tmp.json $WORKDIR/taginfo-config.json
 }
 
 updates_create_db() {
@@ -36,12 +35,10 @@ updates_create_db() {
 }
 
 updates_source_code() {
-    echo "Updating source code, in order to make the code running..."
-
+    echo "Update...Procesor source code"
     # Function to replace the projects repo to get the projects information
     TAGINFO_PROJECT_REPO=${TAGINFO_PROJECT_REPO//\//\\/}
     sed -i -e 's/https:\/\/github.com\/taginfo\/taginfo-projects.git/'$TAGINFO_PROJECT_REPO'/g' $WORKDIR/taginfo/sources/projects/update.sh
-
     # The follow line is requiered to avoid sqlite3 issues
     sed -i -e 's/run_ruby "$SRCDIR\/update_characters.rb"/ruby "$SRCDIR\/update_characters.rb"/g' $WORKDIR/taginfo/sources/db/update.sh
     sed -i -e 's/run_ruby "$SRCDIR\/import.rb"/ruby "$SRCDIR\/import.rb"/g' $WORKDIR/taginfo/sources/projects/update.sh
@@ -51,48 +48,48 @@ updates_source_code() {
 
 download_planet_files() {
     mkdir -p $UPDATE_DIR/planet/
-
     # Check if URL_PLANET_FILE_STATE exist and set URL_PLANET_FILE
     if [[ ${URL_PLANET_FILE_STATE} && ${URL_PLANET_FILE_STATE-x} ]]; then
-        URL_PLANET_FILE=$(curl -D -X GET $URL_PLANET_FILE_STATE)
+        wget -q -O state.planet.txt --no-check-certificate - $URL_PLANET_FILE_STATE
+        URL_PLANET_FILE=$(cat state.planet.txt)
     fi
-
     # Check if URL_HISTORY_PLANET_FILE_STATE exist and set URL_HISTORY_PLANET_FILE
     if [[ ${URL_HISTORY_PLANET_FILE_STATE} && ${URL_HISTORY_PLANET_FILE_STATE-x} ]]; then
-        URL_HISTORY_PLANET_FILE=$(curl -D -X GET $URL_HISTORY_PLANET_FILE_STATE)
+        wget -q -O state.history.txt --no-check-certificate - $URL_HISTORY_PLANET_FILE_STATE
+        URL_HISTORY_PLANET_FILE=$(cat state.history.txt)
     fi
     # Download pbf files
-    wget --no-check-certificate -O $UPDATE_DIR/planet/planet.osm.pbf $URL_PLANET_FILE
-    wget --no-check-certificate -O $UPDATE_DIR/planet/history-planet.osh.pbf $URL_HISTORY_PLANET_FILE
-
+    echo "Downloading...$URL_PLANET_FILE"
+    wget -q -O $UPDATE_DIR/planet/planet.osm.pbf --no-check-certificate - $URL_PLANET_FILE
+    echo "Downloading...$URL_HISTORY_PLANET_FILE"
+    wget -q -O $UPDATE_DIR/planet/history-planet.osh.pbf --no-check-certificate - $URL_HISTORY_PLANET_FILE
+    rm state.planet.txt
+    rm state.history.txt
 }
 
 update() {
-    echo "Update Sqlite DBs at $(date +%Y-%m-%d:%H-%M)..."
-
-    # Download OSM planet replication and full-history files,
+    echo "Update...sqlite databases at $(date +%Y-%m-%d:%H-%M)"
+    # Download OSM planet replication and full-history files
     download_planet_files
-
     # In order to make it work we need to pass first one by one the creation and then all of them "db projects chronology"
-    for value in $CREATE_DB; do
-        updates_create_db $value
+    for db in $CREATE_DB; do
+        echo "Update...taginfo-$db.db"
+        updates_create_db $db
         $WORKDIR/taginfo/sources/update_all.sh $UPDATE_DIR
     done
-
+    echo "Update...$CREATE_DB"
     updates_create_db $CREATE_DB
     $WORKDIR/taginfo/sources/update_all.sh $UPDATE_DIR
-
     # Copy db files into data folder
     cp $UPDATE_DIR/*/taginfo-*.db $DATA_DIR/
     cp $UPDATE_DIR/taginfo-*.db $DATA_DIR/
-
     # Link to download db zip files
     chmod a=r $UPDATE_DIR/download
     ln -sf $UPDATE_DIR/download $WORKDIR/taginfo/web/public/download
 }
 
 start_web() {
-    echo "Start taginfo..."
+    echo "Start...Taginfo web service"
     cd $WORKDIR/taginfo/web && bundle exec rackup --host 0.0.0.0 -p 4567
 }
 
@@ -106,7 +103,6 @@ continuous_update() {
 main() {
     set_taginfo_config
     updates_source_code
-
     # Check if db files are store in the $DATA_DIR in order to start the service or start procesing the file
     NUM_DB_FILES=$(ls $DATA_DIR/*.db | wc -l)
     if [ $NUM_DB_FILES -lt 7 ]; then
@@ -115,5 +111,4 @@ main() {
     start_web &
     continuous_update
 }
-
 main