Update shebang to use env python3

src/autoconf/Config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import getenv
 from time import sleep

src/autoconf/Controller.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from abc import abstractmethod
 from os import getenv

src/autoconf/DockerController.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from typing import Any, Dict, List
 from docker import DockerClient

src/autoconf/IngressController.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from time import sleep
 from traceback import format_exc

src/autoconf/SwarmController.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from time import sleep
 from traceback import format_exc

src/autoconf/main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import _exit, getenv, sep
 from os.path import join

src/common/api/API.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from typing import Literal, Optional, Union
 from requests import request

src/common/cli/main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from argparse import ArgumentParser
 from os import _exit, getenv, sep

src/common/core/blacklist/jobs/blacklist-download.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from contextlib import suppress
 from ipaddress import ip_address, ip_network

src/common/core/bunkernet/jobs/bunkernet-data.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import _exit, getenv, sep
 from os.path import join

src/common/core/bunkernet/jobs/bunkernet-register.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import _exit, getenv, sep
 from os.path import join

src/common/core/bunkernet/jobs/bunkernet.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import getenv, sep
 from pathlib import Path

src/common/core/customcert/jobs/custom-cert.py

@@ -1,11 +1,10 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import getenv, sep
 from os.path import join, normpath
 from pathlib import Path
 from sys import exit as sys_exit, path as sys_path
 from traceback import format_exc
-from typing import Optional
 from base64 import b64decode
 
 for deps_path in [
@@ -103,7 +102,7 @@ try:
 
         cert_data = b64decode(getenv("CUSTOM_SSL_CERT_DATA", ""))
         key_data = b64decode(getenv("CUSTOM_SSL_KEY_DATA", ""))
-        for file, data in [("cert.pem", cert_data), ("key.pem", key_data)]:
+        for file, data in (("cert.pem", cert_data), ("key.pem", key_data)):
             if data != b"":
                 file_path = Path(sep, "var", "tmp", "bunkerweb", "customcert", first_server, file)
                 file_path.parent.mkdir(parents=True, exist_ok=True)
@@ -140,7 +139,7 @@ try:
 
             cert_data = b64decode(getenv(f"{first_server}_CUSTOM_SSL_CERT_DATA", ""))
             key_data = b64decode(getenv(f"{first_server}_CUSTOM_SSL_KEY_DATA", ""))
-            for file, data in [("cert.pem", cert_data), ("key.pem", key_data)]:
+            for file, data in (("cert.pem", cert_data), ("key.pem", key_data)):
                 if data != b"":
                     file_path = Path(sep, "var", "tmp", "bunkerweb", "customcert", first_server, file)
                     file_path.parent.mkdir(parents=True, exist_ok=True)

src/common/core/greylist/jobs/greylist-download.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from contextlib import suppress
 from ipaddress import ip_address, ip_network

src/common/core/jobs/jobs/download-plugins.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from hashlib import sha256
 from io import BytesIO

src/common/core/jobs/jobs/mmdb-asn.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from datetime import date
 from gzip import decompress

src/common/core/jobs/jobs/mmdb-country.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from datetime import date
 from gzip import decompress

src/common/core/letsencrypt/jobs/certbot-auth.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import getenv, sep
 from os.path import join

src/common/core/letsencrypt/jobs/certbot-cleanup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import getenv, sep
 from os.path import join

src/common/core/letsencrypt/jobs/certbot-deploy.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from io import BytesIO
 from os import getenv, sep

src/common/core/letsencrypt/jobs/certbot-new.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import _exit, environ, getenv, sep
 from os.path import join

src/common/core/letsencrypt/jobs/certbot-renew.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import _exit, environ, getenv, sep
 from os.path import join

src/common/core/misc/jobs/anonymous-report.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from json import dumps
 from os import getenv, sep

src/common/core/misc/jobs/default-server-cert.py

@@ -1,6 +1,6 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
-from os import _exit, getenv, sep
+from os import getenv, sep
 from os.path import join
 from pathlib import Path
 from subprocess import DEVNULL, run

src/common/core/misc/jobs/update-check.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import getenv, sep
 from os.path import basename, join

src/common/core/realip/jobs/realip-download.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from contextlib import suppress
 from ipaddress import ip_address, ip_network

src/common/core/selfsigned/jobs/self-signed.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from datetime import timedelta
 from os import getenv, sep

src/common/core/whitelist/jobs/whitelist-download.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from contextlib import suppress
 from ipaddress import ip_address, ip_network

src/common/db/Database.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from contextlib import contextmanager, suppress
 from copy import deepcopy

src/common/db/model.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from sqlalchemy import (
     Boolean,

src/common/gen/Configurator.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from glob import glob
 from hashlib import sha256

src/common/gen/Templator.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from glob import glob
 from importlib import import_module

src/common/gen/main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from argparse import ArgumentParser
 from glob import glob

src/common/gen/save_config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from argparse import ArgumentParser
 from os import R_OK, X_OK, access, environ, getenv, sep

src/common/gen/utils.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import getegid, geteuid
 from pathlib import Path

src/common/utils/ApiCaller.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from io import BytesIO
 from os import getenv, sep

src/common/utils/ConfigCaller.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from glob import glob
 from json import JSONDecodeError, loads

src/common/utils/jobs.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from contextlib import suppress
 from datetime import datetime

src/scheduler/Dockerfile

@@ -50,7 +50,6 @@ WORKDIR /usr/share/bunkerweb
 
 # Add scheduler user, drop bwcli, install runtime dependencies, create data folders and set permissions
 RUN apk add --no-cache bash libgcc libstdc++ libpq openssl libmagic && \
-  ln -s /usr/local/bin/python3 /usr/bin/python3 && \
   addgroup -g 101 scheduler && \
   adduser -h /var/cache/nginx -g scheduler -s /bin/sh -G scheduler -D -H -u 101 scheduler && \
   cp helpers/bwcli /usr/bin/ && \

src/scheduler/JobScheduler.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from copy import deepcopy
 from functools import partial

src/scheduler/main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from argparse import ArgumentParser
 from copy import deepcopy
@@ -6,16 +6,7 @@ from glob import glob
 from hashlib import sha256
 from io import BytesIO
 from json import load as json_load
-from os import (
-    _exit,
-    chmod,
-    environ,
-    getenv,
-    getpid,
-    listdir,
-    sep,
-    walk,
-)
+from os import _exit, chmod, environ, getenv, getpid, listdir, sep, walk
 from os.path import basename, dirname, join, normpath
 from pathlib import Path
 from shutil import copy, rmtree
@@ -322,11 +313,7 @@ if __name__ == "__main__":
                     content = Path(join(root, file)).read_text(encoding="utf-8")
                     custom_conf = {
                         "value": content,
-                        "exploded": (
-                            f"{path_exploded.pop()}" if path_exploded[-1] not in root_dirs else None,
-                            path_exploded[-1],
-                            file.replace(".conf", ""),
-                        ),
+                        "exploded": (path_exploded.pop() if path_exploded[-1] not in root_dirs else None, path_exploded[-1], file.replace(".conf", "")),
                     }
 
                     saving = True
@@ -674,7 +661,6 @@ if __name__ == "__main__":
                     env = db.get_config()
                     env["DATABASE_URI"] = db.database_uri
 
-
     except:
         logger.error(
             f"Exception while executing scheduler : {format_exc()}",

src/ui/main.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from contextlib import suppress
 from os import _exit, getenv, listdir, sep, urandom
@@ -1132,11 +1132,11 @@ def plugins():
                 except (TarError, OSError) as e:
                     errors += 1
                     error = 1
-                    flash(f"{e}", "error")
+                    flash(str(e), "error")
                 except Exception as e:
                     errors += 1
                     error = 1
-                    flash(f"{e}", "error")
+                    flash(str(e), "error")
                 finally:
                     if error != 1:
                         flash(f"Successfully created plugin: <b><i>{folder_name}</i></b>")

src/ui/src/Config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from copy import deepcopy
 from os import sep

src/ui/src/ConfigFiles.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from glob import glob
 from os import listdir, replace, sep, walk
@@ -62,11 +62,7 @@ class ConfigFiles:
                         custom_configs.append(
                             {
                                 "value": f.read(),
-                                "exploded": (
-                                    f"{path_exploded.pop()}" if path_exploded[-1] not in root_dirs else None,
-                                    path_exploded[-1],
-                                    file.replace(".conf", ""),
-                                ),
+                                "exploded": (path_exploded.pop() if path_exploded[-1] not in root_dirs else None, path_exploded[-1], file.replace(".conf", "")),
                             }
                         )
 

src/ui/src/Instances.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from os import sep
 from os.path import join

src/ui/src/ReverseProxied.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from werkzeug.middleware.proxy_fix import ProxyFix
 

src/ui/src/User.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from typing import Optional
 

src/ui/utils.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 from base64 import b64encode
 from io import BytesIO