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

Simplify

Browse Source
This commit is contained in:
doylet 2026-02-15 12:43:52 +11:00
parent ce6330707c
commit 10fd023f56
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devenver.py
View File

@ -138,9 +138,6 @@ def get_exe_install_path(install_dir, label, version_label, exe_rel_path):
result = pathlib.Path(install_dir, exe_rel_path) result = pathlib.Path(install_dir, exe_rel_path)
return result return result
def get_exe_symlink_dir(install_dir):
result = pathlib.Path(install_dir, "Symlinks")
return result
def download_and_install_archive(download_url, def download_and_install_archive(download_url,
download_checksum, download_checksum,
@ -377,7 +374,7 @@ def download_and_install_archive(download_url,
# Do the symlinks # Do the symlinks
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
symlink_dir = get_exe_symlink_dir(install_dir) symlink_dir = install_dir
paths_to_add_to_devenv_script = set() paths_to_add_to_devenv_script = set()
for exe_dict in exe_list: for exe_dict in exe_list:
exe_rel_path = exe_dict['path'] exe_rel_path = exe_dict['path']
@ -798,13 +795,10 @@ def run(user_app_list,
devenv_script_buffer += "set devenver_root=%devenver_root_backslash:~0,-1%\n" devenv_script_buffer += "set devenver_root=%devenver_root_backslash:~0,-1%\n"
devenv_script_buffer += "set devenver_root_backslash=\n" devenv_script_buffer += "set devenver_root_backslash=\n"
devenv_script_buffer += "set path=%~dp0Symlinks;%PATH%\n" devenv_script_buffer += "set path=%~dp0;%PATH%\n"
devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n"
devenv_script_buffer += "set path=%~dp0..\PC\Programs;%PATH%\n"
else: else:
devenv_script_buffer += f"export devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\"\n" devenv_script_buffer += f"export devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\"\n"
devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Scripts\":$PATH\n" devenv_script_buffer += f'PATH="$( cd -- $( dirname -- "${BASH_SOURCE[0]}" ) &> /dev/null && pwd )":$PATH\n'
devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Symlinks\":$PATH\n"
devenv_script_buffer += f"PATH=$(echo $PATH | awk -v RS=: -v ORS=: '/^\/mnt\/c/ {{next}} {{print}}')\n" devenv_script_buffer += f"PATH=$(echo $PATH | awk -v RS=: -v ORS=: '/^\/mnt\/c/ {{next}} {{print}}')\n"
devenv_script_buffer += f"source $devenver_root/unix_fzf-completion.bash\n" devenv_script_buffer += f"source $devenver_root/unix_fzf-completion.bash\n"
devenv_script_buffer += f"source $devenver_root/unix_fzf-key-bindings.bash\n" devenv_script_buffer += f"source $devenver_root/unix_fzf-key-bindings.bash\n"