diff --git a/devenver.py b/devenver.py index 9868250..6c4445b 100644 --- a/devenver.py +++ b/devenver.py @@ -794,9 +794,16 @@ def run(user_app_list, # Write the devenv script with environment variables if is_windows: - devenv_script_buffer += "set PATH=%~dp0Symlinks;%PATH%\n" + devenv_script_buffer += "set devenver_root_backslash=%~dp0\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 path=%~dp0Symlinks;%PATH%\n" + devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n" else: - devenv_script_buffer += f"PATH=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )/Symlinks\":$PATH\n" + devenv_script_buffer += f"devenver_root=\"$( cd -- $( dirname -- \"${{BASH_SOURCE[0]}}\" ) &> /dev/null && pwd )\":$PATH\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 )/Symlinks\":$PATH\n" devenv_script_name = f"{devenv_script_name}.bat" if is_windows else f"{devenv_script_name}.sh" devenv_script_path = pathlib.Path(install_dir, devenv_script_name)