bootstrap: Minor tweaks

This commit is contained in:
Yuri D'Elia 2022-10-12 10:49:09 +02:00
parent 7b7b7167fb
commit 7b0362302e
1 changed files with 11 additions and 6 deletions

View File

@ -141,6 +141,15 @@ def install_dependency(dependency):
fix_executable_permissions(dependency, installation_directory) fix_executable_permissions(dependency, installation_directory)
def get_dependency_version(dependency):
return dependencies[dependency]['version']
def get_dependency_directory(dependency) -> Path:
version = dependencies[dependency]['version']
return Path(directory_for_dependency(dependency, version))
def main() -> int: def main() -> int:
parser = ArgumentParser() parser = ArgumentParser()
# yapf: disable # yapf: disable
@ -155,8 +164,7 @@ def main() -> int:
if args.print_dependency_version: if args.print_dependency_version:
try: try:
version = dependencies[args.print_dependency_version]['version'] print(get_dependency_version(args.print_dependency_version))
print(version)
return 0 return 0
except KeyError: except KeyError:
print('Unknown dependency "%s"' % args.print_dependency_version) print('Unknown dependency "%s"' % args.print_dependency_version)
@ -164,10 +172,7 @@ def main() -> int:
if args.print_dependency_directory: if args.print_dependency_directory:
try: try:
dependency = args.print_dependency_directory print(get_dependency_directory(args.print_dependency_directory))
version = dependencies[dependency]['version']
install_dir = directory_for_dependency(dependency, version)
print(install_dir)
return 0 return 0
except KeyError: except KeyError:
print('Unknown dependency "%s"' % args.print_dependency_directory) print('Unknown dependency "%s"' % args.print_dependency_directory)