diff --git a/SimpleX/main.py b/SimpleX/main.py index 6bd3d0e..5ce94d0 100644 --- a/SimpleX/main.py +++ b/SimpleX/main.py @@ -5,12 +5,16 @@ import json import random import os -if os.path.exists('.env'): - load_dotenv(".env") -else: - load_dotenv(".env.sample") +script_abs_path = os.path.dirname(os.path.abspath(__file__)) +env_path = os.path.join(script_abs_path+"/.env") +default_env_path = os.path.join(script_abs_path+"/.env.sample") -websocket_port = os.environ.get("WEBSOCKET_PORT") +if os.path.exists(env_path): + load_dotenv(dotenv_path=env_path) +else: + load_dotenv(dotenv_path=default_env_path) + +websocket_port = os.getenv("WEBSOCKET_PORT") def is_simplex_link_valid(simplex_link: str) -> bool: diff --git a/scripts/lantern.py b/scripts/lantern.py index 3a43ea7..0eb6b8f 100644 --- a/scripts/lantern.py +++ b/scripts/lantern.py @@ -9,14 +9,18 @@ import time import urllib import sys -if os.path.exists('.env'): - load_dotenv(".env") + +script_abs_path = os.path.dirname(os.path.abspath(__file__)) +env_path = os.path.join(script_abs_path+"/.env") +default_env_path = os.path.join(script_abs_path+"/.env.sample") + +if os.path.exists(env_path): + load_dotenv(dotenv_path=env_path) else: - load_dotenv(".env.sample") - -tor_host = os.environ.get("TOR_HOST") -tor_port = os.environ.get("TOR_PORT") + load_dotenv(dotenv_path=default_env_path) +tor_host = os.getenv("TOR_HOST") +tor_port = os.getenv("TOR_PORT") def main(): #os.system('clear') @@ -1199,4 +1203,4 @@ Maintenance: if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/scripts/uptimechecker.py b/scripts/uptimechecker.py index 103ade6..e3bccea 100644 --- a/scripts/uptimechecker.py +++ b/scripts/uptimechecker.py @@ -7,13 +7,19 @@ import json import pandas as pd import glob -if os.path.exists('.env'): - load_dotenv(".env") -else: - load_dotenv(".env.sample") -tor_host = os.environ.get("TOR_HOST") -tor_port = os.environ.get("TOR_PORT") + +script_abs_path = os.path.dirname(os.path.abspath(__file__)) +env_path = os.path.join(script_abs_path+"/.env") +default_env_path = os.path.join(script_abs_path+"/.env.sample") + +if os.path.exists(env_path): + load_dotenv(dotenv_path=env_path) +else: + load_dotenv(dotenv_path=default_env_path) + +tor_host = os.getenv("TOR_HOST") +tor_port = os.getenv("TOR_PORT") #apt install python3-pandas python3-requests python3-socks