Merge remote-tracking branch 'origin/fix_launcher_overwrite' into vagrant+packer

This commit is contained in:
Dax T. Games
2024-06-03 08:22:30 -04:00
4 changed files with 65 additions and 57 deletions

View File

@ -55,6 +55,7 @@ exit /b
set "GIT_VERSION=%%C"
) else (
echo "'git --version' returned an improper version string!"
%print_debug% :read_version "returned string: '%%A %%B %%C' by executable path: %git_executable%"
pause
exit /b
)

12
vendor/sources.json vendored
View File

@ -6,13 +6,13 @@
},
{
"name": "git-for-windows",
"version": "2.42.0.windows.1",
"url": "https://github.com/git-for-windows/git/releases/download/v2.42.0.windows.1/PortableGit-2.42.0-64-bit.7z.exe"
"version": "2.45.1.windows.1",
"url": "https://github.com/git-for-windows/git/releases/download/v2.45.1.windows.1/PortableGit-2.45.1-64-bit.7z.exe"
},
{
"name": "clink",
"version": "1.5.12",
"url": "https://github.com/chrisant996/clink/releases/download/v1.5.12/clink.1.5.12.c7156f.zip"
"version": "1.6.14",
"url": "https://github.com/chrisant996/clink/releases/download/v1.6.14/clink.1.6.14.93b83f.zip"
},
{
"name": "conemu-maximus5",
@ -21,7 +21,7 @@
},
{
"name": "clink-completions",
"version": "0.4.11",
"url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.4.11.zip"
"version": "0.5.2",
"url": "https://github.com/vladimir-kotikov/clink-completions/archive/v0.5.2.zip"
}
]

View File

@ -73,7 +73,7 @@
},
{
"colorScheme": "One Half Dark",
"commandline": "PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command \"Invoke-Expression 'Import-Module ''%WT_SETTINGS_DIR%\\..\\...\\profile.ps1'''\"",
"commandline": "PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command \"Invoke-Expression 'Import-Module ''%WT_SETTINGS_DIR%\\..\\..\\profile.ps1'''\"",
"guid": "{eb1f6578-ce9d-47a9-a8c7-9b3fdd22302d}",
"hidden": false,
"icon": "%WT_SETTINGS_DIR%\\..\\..\\..\\icons\\cmder_orange.ico",
@ -387,4 +387,4 @@
"themes": [],
"useAcrylicInTabRow": true,
"wordDelimiters": " ()\"',;<>!@#$%^&*|+=[]{}~?\u2502"
}
}