Merge pull request #1919 from bunkerity/staging

Merge branch "staging" into branch "rc"
bunkerity · Jan 20, 2025 · a7be3c5 · a7be3c5
2 parents 8a8b5e7 + d00de0c
commit a7be3c5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/push-doc.yml b/.github/workflows/push-doc.yml
@@ -42,8 +42,9 @@ jobs:
         if: inputs.HIDDEN == true
         run: |
           mike deploy --update-aliases --alias-type=copy ${{ inputs.VERSION }} ${{ inputs.ALIAS }}
-          mike props ${{ inputs.VERSION }} --set hidden=true
+          mike props ${{ inputs.VERSION }} --set hidden=true --push
       - name: Deploy documentation
+        if: inputs.HIDDEN == false
         run: mike deploy --update-aliases --push --alias-type=copy ${{ inputs.VERSION }} ${{ inputs.ALIAS }}
       - name: Set default doc
         if: inputs.ALIAS == 'latest'

diff --git a/src/common/cli/CLI.py b/src/common/cli/CLI.py
@@ -59,7 +59,7 @@ def __init__(self):
         self.__db = None
         if variables_path.is_file():
             with variables_path.open() as f:
-                self.__variables = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#"))
+                self.__variables = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#") and "=" in line)
 
         if Path(sep, "usr", "share", "bunkerweb", "db").exists():
             from Database import Database  # type: ignore

diff --git a/src/common/gen/main.py b/src/common/gen/main.py
@@ -74,7 +74,7 @@
             variables_path = Path(args.variables)
             LOGGER.info(f"Variables : {variables_path}")
             with variables_path.open() as f:
-                dotenv_env = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#"))
+                dotenv_env = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#") and "=" in line)
 
         db = None
         if DB_PATH.is_dir():

diff --git a/src/common/gen/save_config.py b/src/common/gen/save_config.py
@@ -66,7 +66,7 @@
             variables_path = Path(args.variables)
             LOGGER.info(f"Variables : {variables_path}")
             with variables_path.open() as f:
-                dotenv_env = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#"))
+                dotenv_env = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#") and "=" in line)
 
         # Check existences and permissions
         LOGGER.info("Checking arguments ...")

diff --git a/src/scheduler/main.py b/src/scheduler/main.py
@@ -500,7 +500,7 @@ def healthcheck_job():
         dotenv_env = {}
         if tmp_variables_path.is_file():
             with tmp_variables_path.open() as f:
-                dotenv_env = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#"))
+                dotenv_env = dict(line.strip().split("=", 1) for line in f if line.strip() and not line.startswith("#") and "=" in line)
 
         SCHEDULER = JobScheduler(environ, LOGGER, db=Database(LOGGER, sqlalchemy_string=dotenv_env.get("DATABASE_URI", getenv("DATABASE_URI", None))))  # type: ignore