images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-13 03:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

First step at converting msysgit support to git-for-windows support.

Browse Source
This commit is contained in:
Benjamin Staneck 2015-08-23 20:09:06 +02:00
parent dc9263a11c
commit 3e06fcbf07
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -23,7 +23,7 @@ The main advantage of Cmder is portability. It is designed to be totally self-co
## Integration ## Integration
So you've experimented with cmder a little and want to give it a shot in a more permanent home; So you've experimented with Cmder a little and want to give it a shot in a more permanent home;
### Shortcut to open Cmder in a chosen folder ### Shortcut to open Cmder in a chosen folder

4
config/ConEmu.xml
View File

@ -516,8 +516,8 @@
<value name="Name" type="string" data="{git sh}"/> <value name="Name" type="string" data="{git sh}"/>
<value name="Hotkey" type="dword" data="00000000"/> <value name="Hotkey" type="dword" data="00000000"/>
<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/> <value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat &amp; %CMDER_ROOT%\vendor\msysgit\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/> <value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat &amp; %CMDER_ROOT%\vendor\git-for-windows\bin\bash --login -i&quot; -new_console:d:%USERPROFILE%"/>
<value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\msysgit\git-bash.bat"/> <value name="Cmd2" type="string" data="%CMDER_ROOT%\vendor\git-for-windows\git-bash.exe"/>
<value name="Active" type="dword" data="00000000"/> <value name="Active" type="dword" data="00000000"/>
<value name="Count" type="dword" data="00000001"/> <value name="Count" type="dword" data="00000001"/>
</key> </key>

2
scripts/pack.ps1
View File

@ -42,7 +42,7 @@ Ensure-Executable "7z"
$targets = @{ $targets = @{
"cmder.zip" = $null; "cmder.zip" = $null;
"cmder.7z" = $null; "cmder.7z" = $null;
"cmder_mini.zip" = "-x!`"vendor\msysgit`""; "cmder_mini.zip" = "-x!`"vendor\git-for-windows`"";
} }
Delete-Existing "..\Version*" Delete-Existing "..\Version*"

4
vendor/init.bat vendored
View File

@ -21,7 +21,7 @@
:: Run clink :: Run clink
@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" @"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config"
:: Prepare for msysgit :: Prepare for git-for-windows
:: I do not even know, copypasted from their .bat :: I do not even know, copypasted from their .bat
@set PLINK_PROTOCOL=ssh @set PLINK_PROTOCOL=ssh
@ -33,7 +33,7 @@
) else if exist "%ProgramFiles(x86)%\Git" ( ) else if exist "%ProgramFiles(x86)%\Git" (
set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git" set "GIT_INSTALL_ROOT=%ProgramFiles(x86)%\Git"
) else if exist "%CMDER_ROOT%\vendor" ( ) else if exist "%CMDER_ROOT%\vendor" (
set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\msysgit" set "GIT_INSTALL_ROOT=%CMDER_ROOT%\vendor\git-for-windows"
) )
:: Add git to the path :: Add git to the path

2
vendor/profile.ps1 vendored
View File

@ -14,7 +14,7 @@ try {
# Check if git is on PATH, i.e. Git already installed on system # Check if git is on PATH, i.e. Git already installed on system
Get-command -Name "git" -ErrorAction Stop >$null Get-command -Name "git" -ErrorAction Stop >$null
} catch { } catch {
$env:Path += ";$env:CMDER_ROOT\vendor\msysgit\bin" $env:Path += ";$env:CMDER_ROOT\vendor\git-for-windows\bin"
} }
try { try {

6
vendor/sources.json vendored
View File

@ -1,8 +1,8 @@
[ [
{ {
"name": "msysgit", "name": "git-for-windows",
"version": "1.9.5-preview20150319", "version": "v2.5.0.windows.1",
"url": "https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/PortableGit-1.9.5-preview20150319.7z" "url": "https://github.com/git-for-windows/git/releases/download/v2.5.0.windows.1/PortableGit-2.5.0-32-bit.7z.exe"
}, },
{ {
"name": "clink", "name": "clink",