From 8c6455578b8d563ba93d3fc8466ac7669f76b855 Mon Sep 17 00:00:00 2001 From: doylet Date: Tue, 5 Sep 2023 15:20:08 +1000 Subject: [PATCH] linux: Fix script errors on linux --- Internal/os_nvim_init.vim | 6 +++--- devenver.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Internal/os_nvim_init.vim b/Internal/os_nvim_init.vim index 1da0ab0..827c5c4 100644 --- a/Internal/os_nvim_init.vim +++ b/Internal/os_nvim_init.vim @@ -435,11 +435,11 @@ set errorformat+=%\\%%(CTIME%\\)%\\@=%m " ctime.exe -stat " ============================================================================== let s:running_windows = has("win16") || has("win32") || has("win64") if s:running_windows - set makeprg=build - nnoremap :Make ./build.bat + set makeprg=./build.bat else " Set vim terminal to enter normal mode using escape like normal vim behaviour tnoremap - nnoremap :Make ./build.sh set makeprg=./build.sh endif + +nnoremap :Make diff --git a/devenver.py b/devenver.py index 0ba8f67..f21797f 100644 --- a/devenver.py +++ b/devenver.py @@ -802,8 +802,8 @@ def run(user_app_list, devenv_script_buffer += "set path=%~dp0Scripts;%PATH%\n" else: 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_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)