diff --git a/pmb/__init__.py b/pmb/__init__.py index de0a5f79..ecfdd437 100644 --- a/pmb/__init__.py +++ b/pmb/__init__.py @@ -14,6 +14,10 @@ from .helpers import logging as pmb_logging from .helpers import mount from .helpers import other +# pmbootstrap version +__version__ = "1.51.0" + +# Python version check version = sys.version_info if version < (3, 7): print("You need at least Python 3.7 to run pmbootstrap") diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index 32c46bb8..598b1017 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -17,7 +17,6 @@ from pmb.config.sudo import which_sudo # # Exported variables (internal configuration) # -version = "1.51.0" pmb_src = os.path.normpath(os.path.realpath(__file__) + "/../../..") apk_keys_path = pmb_src + "/pmb/data/keys" arch_native = pmb.parse.arch.alpine_native() diff --git a/pmb/config/pmaports.py b/pmb/config/pmaports.py index 59da427a..29678964 100644 --- a/pmb/config/pmaports.py +++ b/pmb/config/pmaports.py @@ -59,7 +59,7 @@ def check_version_pmaports(real): def check_version_pmbootstrap(min): # Compare versions - real = pmb.config.version + real = pmb.__version__ if pmb.parse.version.compare(real, min) >= 0: return diff --git a/pmb/helpers/aportupgrade.py b/pmb/helpers/aportupgrade.py index 692a22a1..4f28659a 100644 --- a/pmb/helpers/aportupgrade.py +++ b/pmb/helpers/aportupgrade.py @@ -34,7 +34,7 @@ def init_req_headers() -> None: return # Generic request headers req_headers = { - 'User-Agent': f'pmbootstrap/{pmb.config.version} aportupgrade'} + 'User-Agent': f'pmbootstrap/{pmb.__version__} aportupgrade'} # Request headers specific to GitHub req_headers_github = dict(req_headers) diff --git a/pmb/install/_install.py b/pmb/install/_install.py index 563fc20f..216b8419 100644 --- a/pmb/install/_install.py +++ b/pmb/install/_install.py @@ -893,7 +893,7 @@ def install_on_device_installer(args, step, steps): "ONDEV_CHANNEL_DESCRIPTION": channel_cfg["description"], "ONDEV_CHANNEL_MIRRORDIR_ALPINE": channel_cfg["mirrordir_alpine"], "ONDEV_CIPHER": args.cipher, - "ONDEV_PMBOOTSTRAP_VERSION": pmb.config.version, + "ONDEV_PMBOOTSTRAP_VERSION": pmb.__version__, "ONDEV_UI": args.ui} pmb.chroot.root(args, ["ondev-prepare"], suffix_installer, env=env) diff --git a/pmb/parse/arguments.py b/pmb/parse/arguments.py index 86e0003b..3af9dc4b 100644 --- a/pmb/parse/arguments.py +++ b/pmb/parse/arguments.py @@ -603,7 +603,7 @@ def arguments(): # Other parser.add_argument("-V", "--version", action="version", - version=pmb.config.version) + version=pmb.__version__) parser.add_argument("-c", "--config", dest="config", default=pmb.config.defaults["config"], help="path to pmbootstrap.cfg file (default in"