runtime(glvs): fix a few issues Commit: https://github.com/vim/vim/commit/c854efc6feea7527bfa30cf118837b676a7ae9d4 Author: GuyBrush <miguel.ba...@live.com> Date: Thu Sep 26 16:14:08 2024 +0200
runtime(glvs): fix a few issues Fix errors on https://github.com/vim/vim/issues/15640 that: * led to use the wrong vim runtime directory name if using powershell or bash on windows. * use a wrong pattern to detect the users runtime dir * allow to use global variables to specify un-archive commands closes: #15722 Signed-off-by: GuyBrush <miguel.ba...@live.com> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/runtime/autoload/getscript.vim b/runtime/autoload/getscript.vim index d61e6992d..d5c133382 100644 --- a/runtime/autoload/getscript.vim +++ b/runtime/autoload/getscript.vim @@ -3,11 +3,14 @@ " Maintainer: This runtime file is looking for a new maintainer. " Original Author: Charles E. Campbell " Date: Jan 21, 2014 -" Version: 36 +" Version: 37 " Installing: :help glvs-install " Usage: :help glvs " Last Change: {{{1 -" 2024 Sep 08 by Vim Project: several small fixes +" 2024 Sep 08 by Vim Project: several small fixes (#15640) +" 2024 Sep 23 by Vim Project: runtime dir selection fix (#15722) +" autoloading search path fix +" substitution of hardcoded commands with global variables " }}} " " GetLatestVimScripts: 642 1 :AutoInstall: getscript.vim @@ -19,7 +22,7 @@ if exists("g:loaded_getscript") finish endif -let g:loaded_getscript= "v36" +let g:loaded_getscript= "v37" if &cp echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)" finish @@ -87,6 +90,24 @@ if !exists("g:GetLatestVimScripts_downloadaddr") let g:GetLatestVimScripts_downloadaddr = 'https://www.vim.org/scripts/download_script.php?src_id=' endif +" define decompression tools (on windows this allows redirection to wsl or git tools). +" Note tar is available as builtin since Windows 11. +if !exists("g:GetLatestVimScripts_bunzip2") + let g:GetLatestVimScripts_bunzip2= "bunzip2" +endif + +if !exists("g:GetLatestVimScripts_gunzip") + let g:GetLatestVimScripts_gunzip= "gunzip" +endif + +if !exists("g:GetLatestVimScripts_unxz") + let g:GetLatestVimScripts_unxz= "unxz" +endif + +if !exists("g:GetLatestVimScripts_unzip") + let g:GetLatestVimScripts_unzip= "unzip" +endif + "" For debugging: "let g:GetLatestVimScripts_wget = "echo" "let g:GetLatestVimScripts_options = "options" @@ -96,18 +117,16 @@ endif let s:autoinstall= "" if g:GetLatestVimScripts_allowautoinstall - if (has("win32") || has("gui_win32") || has("gui_win32s") || has("win16") || has("win64") || has("win32unix") || has("win95")) && &shell !~ ' -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/E1stpVx-00A1qu-FQ%40256bit.org.