From e60709f1a78749b5e311f3372b99de2f1ea06e1d Mon Sep 17 00:00:00 2001 From: Orsiris de Jong Date: Sun, 26 Mar 2023 19:28:39 +0200 Subject: [PATCH] Add audience identifier in version string --- npbackup/__main__.py | 3 ++- npbackup/configuration.py | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/npbackup/__main__.py b/npbackup/__main__.py index 8669217..0d57a18 100644 --- a/npbackup/__main__.py +++ b/npbackup/__main__.py @@ -243,9 +243,10 @@ This is free software, and you are welcome to redistribute it under certain cond args = parser.parse_args() - version_string = "{} v{} {} - {}".format( + version_string = "{} v{}-{} {} - {}".format( __intname__, __version__, + "PRIV" if configuration.IS_PRIV_BUILD else "PUB", __build__, "GUI disabled" if _NO_GUI else "GUI enabled", ) diff --git a/npbackup/configuration.py b/npbackup/configuration.py index ad70c25..390cda4 100644 --- a/npbackup/configuration.py +++ b/npbackup/configuration.py @@ -25,11 +25,12 @@ from npbackup.customization import ID_STRING try: from npbackup._private_secret_keys import AES_KEY, DEFAULT_BACKUP_ADMIN_PASSWORD from npbackup._private_revac import revac - AES_KEY = revac(AES_KEY) + IS_PRIV_BUILD = True except ImportError: try: from npbackup.secret_keys import AES_KEY, DEFAULT_BACKUP_ADMIN_PASSWORD + IS_PRIV_BUILD = False except ImportError: print("No secret_keys file. Please read documentation.") sys.exit(1) @@ -270,3 +271,7 @@ def save_config(config_file: str, config_dict: dict) -> bool: except OSError: logger.critical("Cannot save configuartion file to %s", config_file) return False + + +def is_priv_build() -> bool: + return IS_PRIV_BUILD \ No newline at end of file