From 00cd69734affdeeacf62433a16b88e6d1d9f182c Mon Sep 17 00:00:00 2001 From: doyle Date: Mon, 30 Jan 2023 23:10:19 +1100 Subject: [PATCH] devenver: We don't use the manifest file --- devenver.py | 6 ------ win_setup.py | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/devenver.py b/devenver.py index d3ddfd9..ce7dadc 100644 --- a/devenver.py +++ b/devenver.py @@ -44,16 +44,10 @@ arg_parser.add_argument('--install-dir', default=default_base_install_dir, type=pathlib.Path) -arg_parser.add_argument('--manifest-file', - help=f'Python file that has a get_manifest() function returning a dictionary of applications to download & install (see manifest.py for starters)', - required=True, - type=pathlib.Path) - arg_parser.add_argument('--version', action='version', version='DEVenver v1') - args = arg_parser.parse_args() base_downloads_dir = args.downloads_dir diff --git a/win_setup.py b/win_setup.py index 2747ad2..346b5f9 100644 --- a/win_setup.py +++ b/win_setup.py @@ -333,12 +333,11 @@ with open(odin_msvc_uninstall_script_path, "w") as file: python_exe = pathlib.Path(installed_apps["Python"][0]['exe_path']).relative_to(devenver.base_install_dir) python_install_dir = pathlib.Path(installed_apps["Python"][0]['exe_path']).parent.relative_to(devenver.base_install_dir) win_setup_script_path = pathlib.Path(devenver.script_dir, "win_setup.py") -manifest_script_path = pathlib.Path(devenver.script_dir, "devenver_manifest.py") bootstrap_setup_script = f"""@echo off setlocal EnableDelayedExpansion set PYTHONHOME=%~dp0{python_install_dir} -%~dp0{python_exe} {win_setup_script_path} --manifest-file {manifest_script_path} +%~dp0{python_exe} {win_setup_script_path} pause """