mirror of
https://github.com/cmderdev/cmder.git
synced 2024-11-10 17:59:11 +08:00
trying to get tcc working
This commit is contained in:
parent
541fc16daf
commit
352a16f84d
30
vendor/init.bat
vendored
30
vendor/init.bat
vendored
@ -101,8 +101,8 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
|
|||||||
set architecture_bits=64
|
set architecture_bits=64
|
||||||
)
|
)
|
||||||
|
|
||||||
echo %comspec% |find /i "tcc.exe">nul
|
REM echo %comspec% |find /i "tcc.exe">nul
|
||||||
if %errorlevel% == 1 (
|
REM if %errorlevel% == 1 (
|
||||||
:: Tell the user about the clink config files...
|
:: Tell the user about the clink config files...
|
||||||
if defined "%CMDER_USER_CONFIG%\settings" if not exist "%CMDER_USER_CONFIG%\settings" (
|
if defined "%CMDER_USER_CONFIG%\settings" if not exist "%CMDER_USER_CONFIG%\settings" (
|
||||||
echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings"
|
echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings"
|
||||||
@ -119,7 +119,7 @@ if %errorlevel% == 1 (
|
|||||||
) else (
|
) else (
|
||||||
"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
|
"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor"
|
||||||
)
|
)
|
||||||
)
|
REM )
|
||||||
|
|
||||||
:: Prepare for git-for-windows
|
:: Prepare for git-for-windows
|
||||||
|
|
||||||
@ -134,7 +134,7 @@ if not defined TERM set TERM=cygwin
|
|||||||
:: also check that we have a recent enough version of git by examining the version string
|
:: also check that we have a recent enough version of git by examining the version string
|
||||||
setlocal enabledelayedexpansion
|
setlocal enabledelayedexpansion
|
||||||
if defined GIT_INSTALL_ROOT (
|
if defined GIT_INSTALL_ROOT (
|
||||||
if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" goto :FOUND_GIT)
|
if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" goto :FOUND_GIT
|
||||||
)
|
)
|
||||||
|
|
||||||
%lib_console% debug_output init.bat "Looking for Git install root..."
|
%lib_console% debug_output init.bat "Looking for Git install root..."
|
||||||
@ -205,7 +205,8 @@ if defined GIT_INSTALL_ROOT (
|
|||||||
|
|
||||||
:: define SVN_SSH so we can use git svn with ssh svn repositories
|
:: define SVN_SSH so we can use git svn with ssh svn repositories
|
||||||
if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
|
if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
|
||||||
for /F "delims=" %%F in ('env /usr/bin/locale -uU 2^>nul') do (
|
|
||||||
|
for /F "delims=" %%F in ('env /usr/bin/locale -uU 2') do (
|
||||||
set "LANG=%%F"
|
set "LANG=%%F"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@ -249,15 +250,15 @@ if not defined user_aliases (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
echo %comspec% |find /i "tcc.exe">nul
|
echo %comspec% | find /i "tcc.exe">nul
|
||||||
if %errorlevel% == 1 (
|
if "%errorlevel%" == "1" (
|
||||||
:: The aliases environment variable is used by alias.bat to id
|
REM The aliases environment variable is used by alias.bat to id
|
||||||
:: the default file to store new aliases in.
|
REM the default file to store new aliases in.
|
||||||
if not defined aliases (
|
if not defined aliases (
|
||||||
set "aliases=%user_aliases%"
|
set "aliases=%user_aliases%"
|
||||||
)
|
)
|
||||||
|
|
||||||
:: Make sure we have a self-extracting user_aliases.cmd file
|
REM Make sure we have a self-extracting user_aliases.cmd file
|
||||||
setlocal enabledelayedexpansion
|
setlocal enabledelayedexpansion
|
||||||
if not exist "%user_aliases%" (
|
if not exist "%user_aliases%" (
|
||||||
echo Creating initial user_aliases store in "%user_aliases%"...
|
echo Creating initial user_aliases store in "%user_aliases%"...
|
||||||
@ -279,10 +280,12 @@ if %errorlevel% == 1 (
|
|||||||
:: Update old 'user_aliases' to new self executing 'user_aliases.cmd'
|
:: Update old 'user_aliases' to new self executing 'user_aliases.cmd'
|
||||||
if exist "%CMDER_ROOT%\config\aliases" (
|
if exist "%CMDER_ROOT%\config\aliases" (
|
||||||
echo Updating old "%CMDER_ROOT%\config\aliases" to new format...
|
echo Updating old "%CMDER_ROOT%\config\aliases" to new format...
|
||||||
type "%CMDER_ROOT%\config\aliases" >> "%user_aliases%" && del "%CMDER_ROOT%\config\aliases"
|
type "%CMDER_ROOT%\config\aliases" >> "%user_aliases%"
|
||||||
|
del "%CMDER_ROOT%\config\aliases"
|
||||||
) else if exist "%user_aliases%.old_format" (
|
) else if exist "%user_aliases%.old_format" (
|
||||||
echo Updating old "%user_aliases%" to new format...
|
echo Updating old "%user_aliases%" to new format...
|
||||||
type "%user_aliases%.old_format" >> "%user_aliases%" && del "%user_aliases%.old_format"
|
type "%user_aliases%.old_format" >> "%user_aliases%"
|
||||||
|
del "%user_aliases%.old_format"
|
||||||
)
|
)
|
||||||
endlocal
|
endlocal
|
||||||
)
|
)
|
||||||
@ -337,8 +340,7 @@ echo.
|
|||||||
echo @echo off
|
echo @echo off
|
||||||
) >"%initialConfig%"
|
) >"%initialConfig%"
|
||||||
)
|
)
|
||||||
|
echo %comspec% | find /i "tcc.exe">nul
|
||||||
echo %comspec% |find /i "tcc.exe">nul
|
|
||||||
if %errorlevel% == 1 if exist "%CMDER_ROOT%\bin\alias.bat" if exist "%CMDER_ROOT%\vendor\bin\alias.cmd" (
|
if %errorlevel% == 1 if exist "%CMDER_ROOT%\bin\alias.bat" if exist "%CMDER_ROOT%\vendor\bin\alias.cmd" (
|
||||||
echo Cmder's 'alias' command has been moved into '%CMDER_ROOT%\vendor\bin\alias.cmd'
|
echo Cmder's 'alias' command has been moved into '%CMDER_ROOT%\vendor\bin\alias.cmd'
|
||||||
echo to get rid of this message either:
|
echo to get rid of this message either:
|
||||||
|
4
vendor/lib/lib_path.cmd
vendored
4
vendor/lib/lib_path.cmd
vendored
@ -58,12 +58,12 @@ exit /b
|
|||||||
set found=0
|
set found=0
|
||||||
|
|
||||||
%lib_console% debug_output :enhance_path "Env Var - find_query=%find_query%"
|
%lib_console% debug_output :enhance_path "Env Var - find_query=%find_query%"
|
||||||
echo "%PATH%"|findstr >nul /I /R ";%find_query%\"$"
|
echo %path%|findstr >nul /I /R ";%find_query%\"$"
|
||||||
if "!ERRORLEVEL!" == "0" set found=1
|
if "!ERRORLEVEL!" == "0" set found=1
|
||||||
|
|
||||||
%lib_console% debug_output :enhance_path "Env Var 1 - found=!found!"
|
%lib_console% debug_output :enhance_path "Env Var 1 - found=!found!"
|
||||||
if "!found!" == "0" (
|
if "!found!" == "0" (
|
||||||
echo "%PATH%"|findstr >nul /i /r ";%find_query%;"
|
echo %path%|findstr >nul /i /r ";%find_query%;"
|
||||||
if "!ERRORLEVEL!" == "0" set found=1
|
if "!ERRORLEVEL!" == "0" set found=1
|
||||||
%lib_console% debug_output :enhance_path "Env Var 2 - found=!found!"
|
%lib_console% debug_output :enhance_path "Env Var 2 - found=!found!"
|
||||||
)
|
)
|
||||||
|
2
vendor/lib/lib_profile.cmd
vendored
2
vendor/lib/lib_profile.cmd
vendored
@ -39,7 +39,7 @@ exit /b
|
|||||||
|
|
||||||
pushd "%~1"
|
pushd "%~1"
|
||||||
for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
|
for /f "usebackq" %%x in ( `dir /b *.bat *.cmd 2^>nul` ) do (
|
||||||
%lib_console% verbose-output "Calling '%~1\%%x'..."
|
%lib_console% verbose_output "Calling '%~1\%%x'..."
|
||||||
call "%~1\%%x"
|
call "%~1\%%x"
|
||||||
)
|
)
|
||||||
popd
|
popd
|
||||||
|
Loading…
Reference in New Issue
Block a user