work

scripts/tile_gen/extract_btrfs.sh

@@ -2,7 +2,7 @@
 set -e
 
 TILE_GEN_BIN=/data/ofm/tile_gen/bin
-VENV_PYTHON=$TILE_GEN_BIN/venv/bin/python
+VENV_PYTHON=/data/ofm/venv/bin/python
 
 sudo umount mnt_rw 2> /dev/null || true
 sudo umount mnt_rw2 2> /dev/null || true

scripts/tile_gen/prepare-virtualenv.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-find . -name "*.egg-info" -exec rm -rf {} +
-find . -name __pycache__ -exec rm -rf {} +
-
-# deactivate
-rm -rf venv
-python3 -m venv venv
-
-venv/bin/pip -V
-
-venv/bin/pip install -U pip wheel setuptools
-
-venv/bin/pip install click
-
-

scripts/tile_gen/upload_cloudflare.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
-RUN_STR=$(basename "$PWD")
 AREA=$(basename "$(dirname "$PWD")")
+VERSION=$(basename "$PWD")
 
 
 if [[ $AREA != "planet" && $AREA != "monaco" ]]; then
@@ -28,5 +28,5 @@ rclone sync \
   --stats-one-line \
   --log-file logs/rclone.log \
   --exclude 'logs/**' \
-  . "cf:ofm-$AREA/$RUN_STR"
+  . "cf:ofm-$AREA/$VERSION"