images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-01-27 00:29:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2742 from daxgames/better_bat

Browse Source 
Better bat
This commit is contained in:
Dax T Games 2022-09-04 09:25:03 -04:00 committed by GitHub
commit ef0de62d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -28,3 +28,4 @@ Version v*
.github_changelog_generator .github_changelog_generator
launcher/.vs launcher/.vs
launcher/src/version.rc2 launcher/src/version.rc2
.vs/*

3
CHANGELOG.md
View File

@ -1,6 +1,6 @@
# Change Log # Change Log
## [Unreleased](https://ci.appveyor.com/project/MartiUK/cmder/build/artifacts) (2022-03-17) ## [1.3.20-unreleased](https://ci.appveyor.com/project/MartiUK/cmder/build/artifacts) (2022-03-17)
### Changes ### Changes
@ -9,6 +9,7 @@
### Fixes ### Fixes
- Fix #2740
- Fix find and use latest Git install always using vendored Git. - Fix find and use latest Git install always using vendored Git.
- Fix using Git from vendored Git and other Git for Windows tools from other Git in path. - Fix using Git from vendored Git and other Git for Windows tools from other Git in path.
- Remove setting `term=cygwin` in `init.bat` to fix random `ABCD` characters when using arrow keys in `vim`. - Remove setting `term=cygwin` in `init.bat` to fix random `ABCD` characters when using arrow keys in `vim`.

6
Cmder.bat
View File

@ -4,8 +4,12 @@ SET CMDER_ROOT=%~dp0
:: Remove Trailing '\' :: Remove Trailing '\'
@if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1% @if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%
if not exist "%CMDER_ROOT%\config\user_ConEmu.xml" (
copy "%CMDER_ROOT%\vendor\ConEmu.xml.default" "%CMDER_ROOT%\config\user_ConEmu.xml"
)
if exist "%~1" ( if exist "%~1" (
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1" start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
) else ( ) else (
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml" start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\user_ConEmu.xml"
) )

10
vendor/lib/lib_path.cmd vendored
View File

@ -121,11 +121,11 @@ exit /b
exit /b exit /b
:toolong :toolong
echo "%OLD_PATH%">tempfileA echo "%OLD_PATH%">"%temp%\cmder_lib_pathA"
echo "%PATH%">tempfileB echo "%PATH%">"%temp%\cmder_lib_pathB"
fc /b tempfileA tempfileB 2>nul 1>nul fc /b "%temp%\cmder_lib_pathA" "%temp%\cmder_lib_pathB" 2>nul 1>nul
if errorlevel 1 ( del tempfileA & del tempfileB & goto :changed ) if errorlevel 1 ( del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB" & goto :changed )
del tempfileA & del tempfileB del "%temp%\cmder_lib_pathA" & del "%temp%\cmder_lib_pathB"
exit /b exit /b
:changed :changed