Simplify
This commit is contained in:
parent
10fd023f56
commit
0323f72b9d
@ -767,7 +767,6 @@ def run(user_app_list,
|
|||||||
# Create the paths requested by the user
|
# Create the paths requested by the user
|
||||||
os.makedirs(download_dir, exist_ok=True)
|
os.makedirs(download_dir, exist_ok=True)
|
||||||
os.makedirs(install_dir, exist_ok=True)
|
os.makedirs(install_dir, exist_ok=True)
|
||||||
os.makedirs(pathlib.Path(install_dir, "Symlinks"), exist_ok=True)
|
|
||||||
|
|
||||||
for path in [download_dir, install_dir]:
|
for path in [download_dir, install_dir]:
|
||||||
if not os.path.isdir(path):
|
if not os.path.isdir(path):
|
||||||
@ -789,6 +788,11 @@ def run(user_app_list,
|
|||||||
install_dir=install_dir,
|
install_dir=install_dir,
|
||||||
is_windows=is_windows)
|
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
|
# Write the devenv script with environment variables
|
||||||
if is_windows:
|
if is_windows:
|
||||||
devenv_script_buffer += "set devenver_root_backslash=%~dp0\n"
|
devenv_script_buffer += "set devenver_root_backslash=%~dp0\n"
|
||||||
@ -812,5 +816,5 @@ def run(user_app_list,
|
|||||||
if not is_windows:
|
if not is_windows:
|
||||||
subprocess.run(args=["chmod", "+x", devenv_script_path])
|
subprocess.run(args=["chmod", "+x", devenv_script_path])
|
||||||
|
|
||||||
result = internal_apps
|
result = {**internal_apps, **user_apps}
|
||||||
return result
|
return result
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user