Commit Graph

719 Commits

Author SHA1 Message Date
Dax T. Games
9b25544c05 Fixed - Powershell vim/vim alias opening a new tab when editin a file 2015-11-24 10:58:58 -06:00
Dax T. Games
5eff672a4b Added lambda prompt for bash/mintty, matches cmder and powershell prompts 2015-11-23 22:13:33 -06:00
Dax T. Games
8566b6f6ca Added vi/vim aliases and fixed powershell startup errors 2015-11-23 19:10:22 -05:00
Martin Kemp
1af65edaec Merge pull request #702 from daxgames/msys_bash
Msys bash
2015-11-23 23:31:02 +00:00
Martin Kemp
6d215f58c6 Merge pull request #673 from DoCode/development
Enable the '/single' switch (#577)
2015-11-20 10:50:44 +00:00
Martin Kemp
a3e2d7546d Update to ConEmu 151119
Changelog: https://conemu.github.io/blog/2015/11/19/Build-151119.html
2015-11-20 10:29:32 +00:00
Dax T. Games
7f43014b68 pulled in upstream development branch 2015-11-14 12:15:42 -06:00
Dax T. Games
cf15dcffc7 Added/enhanced bash with cmder.sh/user-cmder.sh, organized tasks menu
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%
2015-11-14 12:07:56 -06:00
Benjamin Staneck
10d0431242 Merge pull request #698 from daxgames/fix_batch_files
Fix batch files
2015-11-14 18:35:30 +01:00
Dax Games
eb5ab51573 Removed training '\' from %CMDER_ROOT% and added config/user-* to .gitignore 2015-11-14 11:14:14 -06:00
Benjamin Staneck
87bc4178e6 fix vim path in powershell profile 2015-11-12 15:18:21 +01:00
Benjamin Staneck
85aaa09d97 Merge pull request #705 from wenzowski/patch-1
add bundled vim to path
2015-11-12 13:52:53 +01:00
Benjamin Staneck
3a2d986c36 ⬆️ Git@v2.6.3.windows.1
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.6.3.windows.1
2015-11-12 13:28:34 +01:00
Benjamin Staneck
37626e7687 ⬆️ ConEmu@151109
Changelog: http://conemu.github.io/blog/2015/11/09/Build-151109.html
We skipped http://conemu.github.io/blog/2015/11/01/Build-151101.html for no reason btw.
2015-11-12 13:25:49 +01:00
Alec Wenzowski
b018f2cc50 add bundled vim to path 2015-11-11 23:28:04 -05:00
Benjamin Staneck
df37981707 ⬆️ ConEmu@v15.10.25
Changelog: http://conemu.github.io/blog/2015/10/25/Build-151025.html
2015-10-27 07:12:21 +01:00
Vladimir Kotikov
66a75ce0dc ⬆️ Bump clink-completions to 0.2.1 2015-10-21 23:19:19 +03:00
Benjamin Staneck
15013369cb ⬆️ ConEmu@151015
Changelogs:
https://conemu.github.io/blog/2015/10/06/Build-151006.html
https://conemu.github.io/blog/2015/10/15/Build-151015.html
2015-10-21 21:24:42 +02:00
Benjamin Staneck
50c5742794 ⬆️ Git@2.6.2.windows.1 2015-10-21 21:21:54 +02:00
Manuel Tanzer
a57c11e171 Enable the '/single' switch by using the registry as statemachine for the current location ('CMDER_START')
Fixed issue #577
2015-10-20 16:49:08 +02:00
Pireax
1d47a98329 lambda was encoded with UTF-8 without BOM, didn't show properly 2015-10-15 19:57:05 +02:00
Pireax
07180effac Fixed problem with Invoke-Expression 2015-10-15 19:56:38 +02:00
Jack Bennett
7ebfffc9da Remove incorrect charater at start of line. 2015-10-14 19:24:54 +01:00
Benjamin Staneck
5a1aa7e25b add overwrite notice to posh profile, too 2015-10-14 19:50:49 +02:00
Pireax
0ab9b74013 Add user startup file for powershell 2015-10-14 18:50:52 +02:00
Benjamin Staneck
fedcee011d fix vim path 2015-10-14 15:35:51 +02:00
Jan Schulz
b8f7bde353 Fix init.bat generation 2015-10-14 12:48:14 +02:00
Jan Schulz
48259b87ac Add a user startup file which can be modified
Up to now, init.bat would be overwritten when a user updated
Cmder. The new mechanism will create a new (mostly empty) file
for the user to enter commands which will then be executed on
each following startup.
2015-10-12 15:15:33 +02:00
Benjamin Staneck
419c785db5 Merge pull request #575 from Bobo1239/enhance-path
Enhance Path in profile.ps1
2015-10-12 13:24:07 +02:00
Benjamin Staneck
1f75f85b7c Merge pull request #605 from Stanzilla/bumpgit
Converting msysgit support to git-for-windows support.
2015-10-12 13:23:06 +02:00
Benjamin Staneck
4203a8a4ea Merge pull request #653 from vladimir-kotikov/development
Upgrade clink-completions to 0.2.0
2015-10-12 13:11:44 +02:00
Benjamin Staneck
83c685cdc7 ⬆️ ConEmu to v15.09.13 2015-10-12 13:06:50 +02:00
Benjamin Staneck
df259195ab ⬆️ ConEmu@150816 2015-10-12 13:06:50 +02:00
Benjamin Staneck
36291ab789 ⬆️ Git for Windows to v2.6.1.windows.1 2015-10-06 21:16:32 +02:00
Vladimir Kotikov
73c8c0c233 Upgrade clink-completions 2015-10-06 21:45:32 +03:00
Benjamin Staneck
32cd7dcb58 ⬆️ Git to v2.6.0.windows.1 2015-09-30 20:35:13 +02:00
Benjamin Staneck
b40b0067c0 ⬆️ Git to v2.5.3.windows.1 2015-09-23 20:51:53 +02:00
Benjamin Staneck
4edec1675a update to 2.5.2 release 2 2015-09-16 06:18:29 +02:00
Benjamin Staneck
583109b695 update to 2.5.2 2015-09-11 22:53:21 +02:00
Benjamin Staneck
6952d602d2 update to 2.5.1
https://github.com/git-for-windows/git/releases/tag/v2.5.1.windows.1
2015-09-02 19:50:44 +02:00
Benjamin Staneck
143e659187 ⬆️ clink to 0.4.5 2015-08-31 04:48:46 +02:00
Benjamin Staneck
5ce077a74a call git's own ssh-agent script instead of our own 2015-08-28 02:53:49 +02:00
Benjamin Staneck
fc85915b2c git 2.5 packages the unix commands in <git>/usr/bin instead of <git>/binso add that to the path, too. 2015-08-28 02:47:02 +02:00
Benjamin Staneck
3e06fcbf07 First step at converting msysgit support to git-for-windows support. 2015-08-23 20:09:06 +02:00
Boris Zhou
316a42b8f9 Enhance Path in profile.ps1 2015-08-03 16:06:41 +02:00
Bond
2a1a736ceb Remove depreciated Enable-GitColors
The function Enable-GitColors is depreciated in dahlbyk/posh-git@4e778e2480 and should be removed here as well.
2015-06-04 23:25:09 +01:00
Martin Kemp
29d1378d7a Add git to PATH (while in Cmder)
Add bundled git to PATH if we can't find git on PATH.
2015-05-19 15:47:06 +01:00
Martin Kemp
c15e29ecb3 $PSScriptRoot compatibility
$PSScriptRoot is not available on PS version 2 or below.

So we'll set it ourselves.
2015-05-19 15:44:32 +01:00
Martin Kemp
a18320c938 Improve warning text when posh-git is missing. 2015-05-17 22:13:23 +01:00
Martin Kemp
f196375f53 Update to latest ConEmu. 2015-05-17 22:08:35 +01:00
Martin Kemp
e549f88b00 Removed extra quotation mark 2015-04-02 12:02:34 +01:00
Martin Kemp
687fb72397 Update sources for 1.2
Updated sources.
2015-04-02 12:00:44 +01:00
Jack Bennett
c466698d6b Only write VCS Status if we're in a git repo
In an effort to speed up the prompt we will only call write-vcsstatus if
there is a .git folder in the current or any parent path recursively.

As this function is called every new prompt line it needs to be as fast as
possible.
2015-03-25 12:29:10 +00:00
Jack Bennett
18fc5e37c7 Check that git can really be used as well as posh-git
Explicitly call `import posh-git` because it doesn't have a module
manifest thus powershell can't autoload it when using a cmdlet.

At present the cmder repo doesn't try to download posh-git so it might be
missing from the users session.
2015-03-25 12:22:07 +00:00
Vladimir Kotikov
b75b3239e7 Adds clink-completions as an external dependency
* Adds package to sources.json
* Merges all cmder's lua modules into one -> cmder.lua to exclude future conflicts
* Adds external modules loading logic
2015-03-20 22:29:34 +03:00
Martin Kemp
69eb956d65 Merge pull request #432 from Jackbennett/ps-revert-newline
Revert new line from commit dc834cc28f
2015-03-18 21:14:39 +00:00
Jack Bennett
dfa58acccc Revert new line from commit dc834cc28f
This matches how cmd looks in conemu for cmder and PS seems to add some
padding around command output so I really don't see what the extra new
line is doing.

Saving dat precious vertical space.
2015-03-18 15:47:01 +00:00
Jack Bennett
e811c60ab2 Leverage the Module Autoload path and save doing it ourselves.
This should be faster too as we won't automatically import all functions
to the session. Powershell now knows where to look before declaring they
don't exist.
2015-03-18 15:33:55 +00:00
Martin Kemp
b25e46d7a7 Merge pull request #364 from narnaud/pr-local-git
Prefer user installed git over cmder one.
2015-03-18 11:00:44 +00:00
Martin Kemp
7169f49fff Merge pull request #311 from sescandell/fix-adminlaunch
FIX CMDER_ROOT for admin launch
2015-03-18 10:35:15 +00:00
Martin Kemp
021263d81c Merge pull request #273 from LeoColomb/master
Fixes small Powershell' loader issues
2015-03-18 10:33:58 +00:00
Jack Bennett
a0d87e8368 Update Conemu <preview realease>, update clink
Lets move to the much newer ConEmu preview release.
Pulling the newer clink also
2015-02-25 15:14:33 +00:00
Łukasz Bołdys
8a885167c3 mercurial prompt 2015-02-23 13:23:39 +01:00
Martin Kemp
a708fff824 Merge pull request #374 from CumpsD/patch-1
Updated vendor references
2015-01-21 23:44:16 +00:00
Martin Kemp
f78e24094b Merge pull request #308 from SheGe/feature/psprompt
Lambda color in powershell was changed to DarkGray
2015-01-21 23:41:00 +00:00
David Cumps
ed7a20cec2 Updated vendor references
- Upgrade to git is needed for a security issue in 1.9.4
- Upgrade of ConEmu is needed for High DPI support
2015-01-21 22:25:01 +01:00
Nicolas Arnaud-Cormos
45ff72b48b Prefer user installed git over cmder one.
Also set SVN_SSH (pointing to git ssh) so we can use git svn on
ssh svn repositories.
2015-01-12 22:17:30 +01:00
Vladimir Kotikov
b831c4569f Updates clink to latest (0.4.3) version 2015-01-09 00:29:57 +03:00
Aleksander Skjæveland Larsen
75707f9a65 Adding script to enable SSH-agent #193
Adding agent-script to bin-folder and a commented out call in init.bat
2014-12-17 14:32:40 +01:00
Léo Colombaro
dc834cc28f Fixes Powershell loader issues
* Fix modules order required
* Add newline before prompt
* Fix color name
2014-12-01 20:40:07 +01:00
Martin Kemp
44e6184487 Update msysgit & conemu
Updated links to latest versions of msysgit and conemu; 1.9.4-preview20140929 and 141117 respectively.
2014-11-20 11:29:03 +00:00
Stéphane
ea3863bc6b FIX CMDER_ROOT for admin launch
When launching a cmd in admin mode, if %ConEmuDir%\..\.. contains any space, it breaks the scripts.
Thanks to this patch, the path is correctly defined now.
2014-11-04 12:26:25 +01:00
Szymon Sito
c8193ea368 Lambda color in powershell was changed to DarkGray 2014-10-29 21:27:30 +01:00
Léo Colombaro
f5eb662783 Delete PsGet.psd1 2014-09-17 15:02:31 +02:00
Léo Colombaro
98350e14e8 Add custom loader for Powershell, improve its implementation in Cmder
Fixes #104, fixes #53, fixes #65 (my bad), related to #136, and should
fix #139
2014-09-17 09:55:15 +02:00
Martin Kemp
a39c632d71 Merge pull request #166 from glucas/run_as_admin
Find cmder files when running as Administrator.
2014-08-27 09:58:14 +01:00
Martin Kemp
72c045dc2d Merge pull request #244 from narnaud/fix-clinkversion
Fix clink version
2014-08-26 12:37:52 +01:00
Nicolas Arnaud-Cormos
5ee2fb2a8d Fix clink version 2014-08-26 13:20:38 +02:00
Nicolas Arnaud-Cormos
662663813e The latest msysgit comes with vim 7.4. 2014-08-26 05:50:07 +02:00
Martin Kemp
6a9d6dd37e bump versions again 2014-08-04 22:13:23 +01:00
Martin Kemp
e9707b2022 Bump versions 2014-06-19 08:27:44 +01:00
Samuel Vasko
9939b1ba7f CMDER_ROOT variable is now also in path
Now you can call cmder /whatever from cmder shell
2014-04-29 15:32:56 +02:00
Samuel Vasko
6b37074dd5 Reordered the PATH, closing #37
Now the msysgit is being loaded first, so find will invoke
the correct and better version
2014-04-11 14:02:34 +02:00
Samuel Vasko
f6c3a0c390 Merge pull request #152 from bliker/scripts
New build and pack scripts
2014-04-10 14:44:39 +02:00
Samuel Vasko
46bebee94c More recent package versions 2014-04-10 12:57:45 +02:00
Marc Schlaich
fa33052096 Only cd to $HOME if started in CMDER_ROOT. 2014-03-19 12:25:41 +01:00
Greg Lucas
3b053f8848 Remove extraneous quotes.
Extra quotes in previous commit caused PATH to be set incorrectly in admin
shell.
2014-03-13 12:36:07 -04:00
Greg Lucas
c76950293e Find cmder files when running as Administrator.
When starting a shell as Administrator, the CMDER_ROOT variable is
not propagated from the parent (non-Admin) environment.
Fix this by using paths relative to %ConEmuDir%.

Fixes issue #94.
2014-03-13 11:48:50 -04:00
Greg Lucas
ea22c658b7 CD to HOME by default. 2014-03-11 15:12:35 -04:00
Greg Lucas
303bfda521 Use HOME if already set. 2014-03-11 15:08:24 -04:00
Samuel Vasko
f4b6d8f9a8 Refactored mail download loop, better error handling 2014-03-05 11:22:58 +01:00
Jack Bennett
3bd0fe517f Need to use an optional package field;
incase url's that don't put the file in the url.
2014-02-26 16:42:48 +00:00
Samuel Vasko
83cd726a41 First sources.json draft 2014-02-24 17:55:34 +01:00
Alberto Solano
2c8364ce58 fixed little mistake in vendor/readme 2013-12-13 00:32:22 +01:00
Alberto Solano
fc3422e1ba fixed errors and grammar 2013-12-13 00:32:22 +01:00
Samuel Vasko
4744fb1c61 Messages are useless, I always clear them 2013-12-09 00:56:16 +01:00
Samuel Vasko
3c979780f9 handles spaces better, also using CMDER_ROOT for everything 2013-12-09 00:55:18 +01:00
Samuel Vasko
fa179f6528 Lambda is now handled by clink 2013-12-07 21:04:38 +01:00
Samuel Vasko
8e0312aec4 Merge pull request #62 from austinwagner/master
Add executable launcher
2013-12-07 10:50:34 -08:00
Austin Wagner
8f6a473a40 Add Cmder Here
Add option to launcher to register and unregister Cmder Here
2013-12-07 09:17:35 -05:00
Brandon Coffman
56613b9758 Change TERM from msys to cygwin. 2013-12-05 06:03:13 -05:00
Samuel Vasko
9d5d3e1556 Allow to run cmd task from custom location. 2013-11-29 12:09:20 +01:00
Martin Kemp
f3d93c0f99 Allow use of Vim from msysgit.
Added vim location to PATH setup in init.bat.
2013-11-28 16:32:37 +00:00
Shoozza
0bde8b361a Fix spelling in init.bat 2013-11-27 10:11:29 +01:00
Jonas Stendahl
75cb46392e Fixed issue when rootDir contains spaces. 2013-11-22 11:11:04 +01:00
Samuel Vasko
c2b37021d4 Now with git in prompt (fix for #13) 2013-11-15 17:06:15 +01:00
Samuel Vasko
4c4930704f Fix for #1 #11 handling of C:\Users\Samuel directory 2013-11-13 14:34:19 +01:00
Samuel Vasko
42d22f1e17 Removed home declaration 2013-11-03 18:04:36 +01:00
Tom Green
ee898d9d28 minor typo fix 2013-10-08 11:29:35 +01:00
Samuel Vasko
4dc1065399 Forgot the prefix echo with @ 2013-09-28 20:43:09 +02:00
Samuel Vasko
eaa78c6bf3 created new build script, and accomodated to new file names 2013-09-28 20:38:52 +02:00
Samuel Vasko
3704ff3e2e At a second glance, I do not like it 2013-09-25 21:08:58 +02:00
Samuel Vasko
ec5f8f9808 Git initiation 2013-09-07 17:52:50 +02:00
Samuel Vasko
2c0a6d095f Changes for startup 2013-09-07 17:39:24 +02:00
Samuel Vasko
5bb4808835 Alias fix 2013-07-16 18:26:48 +02:00
Samuel Vasko
10f7afdef2 Alias fixed 2013-07-15 23:45:25 +02:00
Samuel Vasko
4d063c76c3 Readme for subfolders 2013-07-15 22:45:47 +02:00
Samuel Vasko
0c0d1f2bf4 New path modifications 2013-07-15 22:45:23 +02:00
Samuel Vasko
36f2aa2527 Readme for subfolders 2013-07-09 09:51:53 +02:00