issue #36 - env variables: .env works from anywhere on the system using absolute path fixed the issue

This commit is contained in:
SovereigntyIsNotFreedom 2025-03-25 09:16:08 +00:00
parent acad0af3a1
commit 5a7d14c16a
3 changed files with 32 additions and 18 deletions

View file

@ -5,12 +5,16 @@ import json
import random import random
import os import os
if os.path.exists('.env'): script_abs_path = os.path.dirname(os.path.abspath(__file__))
load_dotenv(".env") env_path = os.path.join(script_abs_path+"/.env")
else: default_env_path = os.path.join(script_abs_path+"/.env.sample")
load_dotenv(".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: def is_simplex_link_valid(simplex_link: str) -> bool:

View file

@ -9,14 +9,18 @@ import time
import urllib import urllib
import sys 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: else:
load_dotenv(".env.sample") load_dotenv(dotenv_path=default_env_path)
tor_host = os.environ.get("TOR_HOST")
tor_port = os.environ.get("TOR_PORT")
tor_host = os.getenv("TOR_HOST")
tor_port = os.getenv("TOR_PORT")
def main(): def main():
#os.system('clear') #os.system('clear')
@ -1199,4 +1203,4 @@ Maintenance:
if __name__ == '__main__': if __name__ == '__main__':
main() main()

View file

@ -7,13 +7,19 @@ import json
import pandas as pd import pandas as pd
import glob 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 #apt install python3-pandas python3-requests python3-socks