Merge latest development #771
Merged
Conversation
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
…`ConEmu-%COMPUTERNAME%.ini`, before checking for the standard ini file `ConEmu.ini`.
… the current location ('CMDER_START')
Fixed issue #577
added personal files to .gitignore so they never get uploaded to the repo and added support for msys2 bash in the new git for windows added autocreate of config/user-cmder.sh if iot does not exist and added it to the .gitignore Added tasks: cmd::Cmder, cmd::Cmder as Admin, bash::bash, bash::bash as Admin, bash::mintty, bash::mintty as admin, powershell::powershell, powershell::powershell as Admin. Set default task to cmd::Cmder. Cot rid of init.bat running before /bin/bash, fixes double exit requirement Added running git for windows post-install.bat on first cmder launch fixed file/path not found errors when launching powershell as admin fixed file/path not found errors when launching bash/mintty as admin fixed PATH in vendor/cmder.sh Added sourcing ~/.bashrc if it exists. changed .gitignore to ignore anything with path of config/user-* removed my personal files from .gitignore, left in config/user-* Make sure $CMDER_ROOT does not have a trailing '/' %CMDER_ROOT% does not have trailing '\'. allow user to specify a conemu.xml on the command line Removed '\' from %CMDER_ROOT%
Update to conemu 151119
Enable the '/single' switch (#577)
Msys bash
Added vi/vim aliases and fixed powershell startup errors
Fixed - Powershell vim/vim alias opening a new tab when editing a file
… 100% supported Cmder tasks
… an ico if launched from the cmder.bat file
….bat. Installing from https://git-scm.com/download/win seems to put git in this directory.
Added check for git install path in init.bat.
Do not overwrite aliases on update
Fix icons
Fix vendor/init.bat when the PATH contains spaces.
Bump clink to 0.4.6
The new system works by setting "CMDER_START" if a cmder.exe gets a startup path. The rest is then implemented in the profile.ps1 and init.bat. The new system works as follows: 1.If a startup path is given, cmder.exe sets this as `CMDER_START` and the startup scripts change to that directory. 2.If the usere sets a `CMDER_START` environment variable and this is not overwritten by cmder.exe, this variable is taken as the startup directory by the startup scripts. 3.If not such path is give, the conemu startup dirs is the winner, as the startup scripts don't change anything.
Make "cmder here" work again
CMDER_START should always be set as a result of either: 1. The user passes a directory to cmder.exe using `/START $DIR` - or - 2. Sets CMDER_START as a default environment variable. Fixes #772
4bfdf04 moved all clink config files to vendor/ and therefore the files in config/ were not used and .history was also moved to vendor/. The new arrangement uses `--script` to load our own clink.lua file which in turn as the first thing loads the original clink.lua file. The user defined files are again in config/. As clink regenerates these files, if they are not present, this also means that we don't need to include the settings file in the git repo and therefore don't overwrite it on updates.
Introduce a header like in the rest of the scripts that this file is overwritten on updates and should not be modified.
USER_PROFILE is a known folder, so use that functionality to get it.
Reorganize how clink settings are loaded
This reverts commit 4dc1249.
Set tasks to always use CMDER_START
Fix build script not exiting on msbuild failure.
|
will you build a new .exe file aswell ? On Mon, Feb 8, 2016 at 10:07 PM, Martin Kemp notifications@github.com
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.