From f6f00319ed395cb0b0a6179d8e9ddbd1151f5eff Mon Sep 17 00:00:00 2001 From: Ben Puls Date: Thu, 29 Aug 2024 18:55:40 +0500 Subject: [PATCH] Refactor code to improve readability --- utility/generate_packages.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/utility/generate_packages.py b/utility/generate_packages.py index 07bcd50..429cc77 100644 --- a/utility/generate_packages.py +++ b/utility/generate_packages.py @@ -3,12 +3,14 @@ import os import shutil import subprocess + def check_dependency(dependency): if shutil.which(dependency): return True print(f"{dependency} not installed.") return False + script_dir = os.path.dirname(os.path.realpath(__file__)) # loading versions information from json @@ -16,6 +18,7 @@ version_info_path = os.path.join(script_dir, "version_info.json") with open(version_info_path, "r") as f: version_info = json.load(f) + # Arch def generate_arch(): pkgbuild_template = os.path.join(script_dir, "../templates/PKGBUILD") @@ -35,7 +38,7 @@ def generate_arch(): # Nix - + def is_nix_version_2_19(): version = subprocess.run(["nix", "--version"], capture_output=True, text=True).stdout.split()[2] print(f"Nix version: {version}") @@ -44,6 +47,7 @@ def is_nix_version_2_19(): return True return False + def generate_nix(): nixcmd = "nix --extra-experimental-features nix-command --extra-experimental-features flakes" flake_path = os.path.join(script_dir, "../flake.nix") @@ -53,14 +57,14 @@ def generate_nix(): flake = f.read() _start_index = flake.find("ymExe.url = ") _end_index = flake.find(";", _start_index) - flake = flake.replace(flake[_start_index:_end_index+1], f'ymExe.url = "{version_info["ym"]["exe_link"]}";') + flake = flake.replace(flake[_start_index:_end_index + 1], f'ymExe.url = "{version_info["ym"]["exe_link"]}";') with open(flake_path, "w") as f: f.write(flake) if not check_dependency("nix"): print("flake.nix was updated, but nix is not installed to update flake.lock") return - + if is_nix_version_2_19(): subprocess.run(f"{nixcmd} flake update ymExe", shell=True) else: @@ -71,4 +75,4 @@ def generate_nix(): generate_arch() -generate_nix() \ No newline at end of file +generate_nix()