doylet/DEVenv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux fixes

Browse Source
This commit is contained in:
doylet 2026-02-14 17:53:35 +11:00
parent 3ac339633a
commit 73f6d4ae58
2 changed files with 117 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devenver.py
View File

@ -511,7 +511,7 @@ internal_app_list = []
devenv_script_buffer = ""
def install_app_list(app_list, download_dir, install_dir, is_windows):
title = "Internal Apps" if app_list is internal_app_list else "User Apps"
title = "Internal Apps"
print_header(title)
result = {}
@ -792,11 +792,6 @@ def run(user_app_list,
install_dir=install_dir,
is_windows=is_windows)
user_apps = install_app_list(app_list=user_app_list,
download_dir=download_dir,
install_dir=install_dir,
is_windows=is_windows)
# Write the devenv script with environment variables
if is_windows:
devenv_script_buffer += "set devenver_root_backslash=%~dp0\n"
@ -823,13 +818,5 @@ def run(user_app_list,
if not is_windows:
subprocess.run(args=["chmod", "+x", devenv_script_path])
# Merge the install dictionaries, this dictionary contains
# (app label) -> [array of installed versions]
result = internal_apps
for key, value in user_apps.items():
if key not in result:
result.update({key: value})
else:
result[key] += value
return result

18
install.py
View File

@ -44,16 +44,6 @@ arg_parser.add_argument('--install-dir',
default="",
type=pathlib.Path)
arg_parser.add_argument('--with-dev-apps',
help=f'Download and install apps from the developer manifest',
const=True,
action="store_const")
arg_parser.add_argument('--with-user-apps',
help=f'Download and install apps from the user manifest',
const=True,
action="store_const")
arg_parser.add_argument('operating_system',
choices=['win', 'linux'],
help=f'Download and install apps for the specified operating system')
@ -73,9 +63,6 @@ if install_dir == pathlib.Path(""):
install_dir = devenver.script_dir / 'Linux'
# Install development apps
# ------------------------------------------------------------------------------
if args.with_dev_apps:
# Run DEVenver, installing the portable apps
dev_env_script_name = "dev_env"
app_list = app_manifest_dev.get_manifest(is_windows=is_windows)
installed_dev_apps = devenver.run(user_app_list=app_list,
@ -83,9 +70,8 @@ if args.with_dev_apps:
install_dir=install_dir,
devenv_script_name=dev_env_script_name,
is_windows=is_windows)
install_script_path = pathlib.Path(devenver.script_dir, "install.py")
if is_windows:
# Install apps dependent on Git
devenver.print_header("Install apps that rely on Git")
@ -240,7 +226,7 @@ start "" /MAX "%~dp0{installed_dev_apps["WezTerm"][0]["exe_path"].relative_to(in
shutil.copy(internal_dir / "win_dev.bat", install_dir / "dev.bat")
else:
shutil.copy(internal_dir / "unix_dev.sh", install_dir / "dev.sh")
subprocess.run(args=["chmod", "+x", install_dir / "dev.sh")
subprocess.run(args=["chmod", "+x", install_dir / "dev.sh"])
# Install left-overs
devenver.print_header("Install configuration files")