-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Msys bash #702
Merged
Merged
Msys bash #702
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,11 @@ | ||
| @echo off | ||
| SET CMDER_ROOT=%~dp0 | ||
| if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1% | ||
| start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml" | ||
|
|
||
| :: Remove trailing '\' | ||
| @if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1% | ||
|
|
||
| if exist "%~1" ( | ||
| start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1" | ||
| ) else ( | ||
| start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,3 +16,4 @@ icons\icon_256.png | |
| Cmder.bat | ||
| vendor\tmp | ||
| appveyor.yml | ||
| vendor\cmder.sh | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| # DO NOT EDIT THIS FILE IT WILL BE OVERWRITTEN ON UPDATE | ||
| # | ||
| # Add portable user customizations ${CMDER_ROOT}/config/user-cmder.sh, | ||
| # these customizations will follow Cmder if $CMDER_ROOT is copied | ||
| # to another machine. | ||
| # | ||
| # Add system specific users customizations to $HOME/.bashrc, these | ||
| # customizations will not follow Cmder to another machine. | ||
|
|
||
| # We do this for bash as admin sessions since $CMDER_ROOT is not being set | ||
| if [ "$CMDER_ROOT" == "" ] ; then | ||
| case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac | ||
| else | ||
| case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac | ||
| fi | ||
|
|
||
| # Remove any trailing '/' | ||
| CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::') | ||
|
|
||
| export CMDER_ROOT | ||
|
|
||
| if [ -d "/c/Program Files/Git" ] ; then | ||
| GIT_INSTALL_ROOT="/c/Program Files/Git" | ||
| elif [ -d "/c/Program Files(x86)/Git" ] ; then | ||
| GIT_INSTALL_ROOT="/c/Program Files(x86)/Git" | ||
| elif [ -d "${CMDER_ROOT}/vendor/git-for-windows" ] ; then | ||
| GIT_INSTALL_ROOT=${CMDER_ROOT}/vendor/git-for-windows | ||
| fi | ||
|
|
||
| if [[ ! "$PATH" =~ "${GIT_INSTALL_ROOT}/bin:" ]] ; then | ||
| PATH=${GIT_INSTALL_ROOT}/bin:$PATH | ||
| fi | ||
|
|
||
| PATH=${CMDER_ROOT}/bin:$PATH:${CMDER_ROOT} | ||
|
|
||
| export PATH | ||
|
|
||
| if [ -f ${CMDER_ROOT}/config/user-cmder.sh ] ; then | ||
| . ${CMDER_ROOT}/config/user-cmder.sh | ||
| else | ||
| echo Creating user startup file: "${CMDER_ROOT}/config/user-cmder.sh" | ||
| cat <<-eof >"${CMDER_ROOT}/config/user-cmder.sh" | ||
| # use this file to run your own startup commands for msys2 bash' | ||
|
|
||
| # To add a new vendor to the path, do something like: | ||
| # export PATH=\${CMDER_ROOT}/vendor/whatever:\${PATH} | ||
| eof | ||
| fi | ||
|
|
||
| # Source the users .bashrc file if it exists | ||
| if [ -f "${HOME}/.bashrc" ] ; then | ||
| . "${HOME}/.bashrc" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure this should be ignored?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. The build.ps1 puts it where it needs to be whenrunning a bash shell.
I ignore it in packing to avoid confusion of having the same file in two
places, vendor/cmder.sh is not used when running cmder.
On November 10, 2015 3:20:06 AM Martin Kemp notifications@github.com wrote: