diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-03-09 19:12:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-09 19:12:27 +0000 |
commit | 20926570fb803ac895c0f8c9ebfcdbcbee2aba3f (patch) | |
tree | 950e88ee909bfebecd5586ea2df56402dbed4f2b | |
parent | 1ffd14b3212f1fafd087dadc7a1a8548f53c6cab (diff) |
binhostURL -> bhaddr
-rw-r--r-- | src/backend/checkenv.py | 4 | ||||
-rw-r--r-- | src/backend/getenv.py | 10 | ||||
-rw-r--r-- | src/backend/update.py | 16 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/backend/checkenv.py b/src/backend/checkenv.py index 49c2883..c90d460 100644 --- a/src/backend/checkenv.py +++ b/src/backend/checkenv.py @@ -11,10 +11,10 @@ def root(): def sanity(): activeBranch = sisyphus.getenv.systemBranch() - binhostURL = sisyphus.getenv.binhostURL() + bhaddr = sisyphus.getenv.bhaddr() isSane = int() - if "packages-next" in binhostURL: + if "packages-next" in bhaddr: if activeBranch == "next": isSane = int(1) else: diff --git a/src/backend/getenv.py b/src/backend/getenv.py index e478eb6..1418d88 100644 --- a/src/backend/getenv.py +++ b/src/backend/getenv.py @@ -6,21 +6,21 @@ import subprocess import sisyphus.getfs -def binhostURL(): - binhostURL = [] +def bhaddr(): + bhaddr = [] p_exe = subprocess.Popen( ['emerge', '--info', '--verbose'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): if "PORTAGE_BINHOST" in p_out: - binhostURL = p_out.rstrip().split("=")[1].strip('\"') + bhaddr = p_out.rstrip().split("=")[1].strip('\"') p_exe.wait() - return binhostURL + return bhaddr def csvURL(): - csvURL = binhostURL() + csvURL = bhaddr() packagesCsvURL = [] descriptionsCsvURL = [] diff --git a/src/backend/update.py b/src/backend/update.py index 82f66d4..b2bb322 100644 --- a/src/backend/update.py +++ b/src/backend/update.py @@ -21,36 +21,36 @@ def syncAll(): @animation.wait('fetching updates') def start(): activeBranch = sisyphus.getenv.systemBranch() - binhostURL = sisyphus.getenv.binhostURL() + bhaddr = sisyphus.getenv.bhaddr() isSane = sisyphus.checkenv.sanity() if isSane == 1: syncAll() else: - if "packages-next" in binhostURL: + if "packages-next" in bhaddr: print(sisyphus.getcolor.green + "\n\nActive branch:" + " " + sisyphus.getcolor.reset + "'" + activeBranch + "'" + " " + "(stable)" + - " " + sisyphus.getcolor.green + "\nActive binhost:" + " " + sisyphus.getcolor.reset + "'" + binhostURL + "'" + " " + "(testing)") + " " + sisyphus.getcolor.green + "\nActive binhost:" + " " + sisyphus.getcolor.reset + "'" + bhaddr + "'" + " " + "(testing)") else: print(sisyphus.getcolor.green + "\n\nActive branch:" + " " + sisyphus.getcolor.reset + "'" + activeBranch + "'" + " " + "(testing)" + - " " + sisyphus.getcolor.green + "\nActive binhost:" + " " + sisyphus.getcolor.reset + "'" + binhostURL + "'" + " " + "(stable)") + " " + sisyphus.getcolor.green + "\nActive binhost:" + " " + sisyphus.getcolor.reset + "'" + bhaddr + "'" + " " + "(stable)") sys.exit(sisyphus.getcolor.bright_red + "\n\nInvalid configuration!" + sisyphus.getcolor.reset + sisyphus.getcolor.bright_yellow + "\nUse" + sisyphus.getcolor.reset + " " + "'" + "sisyphus branch --help" + "'" + " " + sisyphus.getcolor.bright_yellow + "for help" + sisyphus.getcolor.reset) def xstart(): activeBranch = sisyphus.getenv.systemBranch() - binhostURL = sisyphus.getenv.binhostURL() + bhaddr = sisyphus.getenv.bhaddr() isSane = sisyphus.checkenv.sanity() if isSane == 1: syncAll() else: - if "packages-next" in binhostURL: + if "packages-next" in bhaddr: print("\n\nActive branch:" + " " + "'" + activeBranch + "'" + " " + "(stable)" + - "\nActive binhost:" + " " + "'" + binhostURL + "'" + " " + "(testing)") + "\nActive binhost:" + " " + "'" + bhaddr + "'" + " " + "(testing)") else: print("\n\nActive branch:" + " " + "'" + activeBranch + "'" + " " + "(testing)" + - "\nActive binhost:" + " " + "'" + binhostURL + "'" + " " + "(stable)") + "\nActive binhost:" + " " + "'" + bhaddr + "'" + " " + "(stable)") print("\n\nInvalid configuration!" + "\nUse 'sisyphus branch --help' for help\n") t = int(10) |