Linux fixes

This commit is contained in:
2026-02-14 17:53:35 +11:00
parent 3ac339633a
commit 73f6d4ae58
2 changed files with 117 additions and 144 deletions
+1 -14
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