From 64d2f15be2e1cd0fac029e05a2796f575ad8f5de Mon Sep 17 00:00:00 2001
From: Michael S2pac <mixa21.11@mail.ru>
Date: Mon, 15 Dec 2025 17:20:24 +0300
Subject: [PATCH] Refactored previous commit

---
 DockerEntrypoint.sh | 18 ++++++------------
 docker-compose.yml  |  1 -
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/DockerEntrypoint.sh b/DockerEntrypoint.sh
index cb907616..455c3211 100644
--- a/DockerEntrypoint.sh
+++ b/DockerEntrypoint.sh
@@ -1,24 +1,18 @@
 #!/bin/sh
 
-if [ -z "$GEODATA_DIR" ]; then
-  echo "ERROR: GEODATA_DIR environment variable is not set"
-  exit 1
-fi
+set -eu
 
-if [ -z "$MAX_GEODATA_DIR_WAIT" ]; then
-  echo "WARNING: MAX_GEODATA_DIR_WAIT environment variable is not set, using default MAX_GEODATA_DIR_WAIT=300"
-  MAX_GEODATA_DIR_WAIT=300
-fi
+: "${MAX_GEODATA_DIR_WAIT:=30}"
+: "${WAIT_INTERVAL:=10}"
+: "${GEODATA_DIR:?GEODATA_DIR is required}"
 
 FINISH_FILE="$GEODATA_DIR/cron-job-finished.txt"
-
 ELAPSED=0
-INTERVAL=10
 
 while [ ! -f "$FINISH_FILE" ] && [ "$ELAPSED" -lt "$MAX_GEODATA_DIR_WAIT" ]; do
   echo "Waiting for geodata initialization... ($ELAPSED/$MAX_GEODATA_DIR_WAIT seconds)"
-  sleep $INTERVAL
-  ELAPSED=$((ELAPSED + INTERVAL))
+  sleep $WAIT_INTERVAL
+  ELAPSED=$((ELAPSED + WAIT_INTERVAL))
 done
 
 if [ ! -f "$FINISH_FILE" ]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index 137ac605..0fa748c1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,6 @@ services:
       XRAY_VMESS_AEAD_FORCED: "false"
       XUI_ENABLE_FAIL2BAN: "true"
       GEODATA_DIR: "/app/bin"
-      MAX_GEODATA_DIR_WAIT: 300 # 5 minutes
     tty: true
     network_mode: host
     restart: unless-stopped