images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-15 08:19:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,780 Commits 9 Branches 38 Tags 6.7 MiB
9120d92318
Commit Graph

783 Commits

Author SHA1 Message Date
Dax T. Games
a857d8419c fixes for cmd:cmder init script 2019-12-04 16:04:16 -05:00
Dax T. Games
0cf1c5e2eb fix 2019-11-23 18:13:03 -05:00
Dax T. Games
2428e8529f dd per shell git opt out 2019-11-23 11:54:53 -05:00
Dax T. Games
589b48d06e update conemu 2019-11-09 17:50:57 -05:00
Dax T. Games
3ee244e4c1 allow git prompt status opt out for powershell and bash 2019-11-09 16:36:16 -05:00
Dax T. Games
44bc089ee4 move lambda to cmder prompt method for easier user change 2019-11-03 14:14:47 -05:00
Dax T. Games
6ab4599a4d separate powershell functions from profile.ps1 2019-11-03 13:07:20 -05:00
Dax T. Games
dac4b27e28 separate powershell functions from profile.ps1 2019-11-03 12:59:36 -05:00
Dax T. Games
661f59d0fb Fix #2191 profile.ps1: CheckGit does not export $gitLoaded 2019-11-03 12:36:28 -05:00
Dax T. Games
44a8bf5802 add ability to disable git 2019-11-03 11:00:27 -05:00
Dax T Games
f1a9721256
Update init.bat 2019-10-22 22:44:17 -04:00
Dax Games
34468ef2fd cleanup 2019-08-22 06:20:19 -04:00
Dax Games
5cb8021864 Merge branch 'fix_path_with!' of https://github.com/daxgames/cmder into fix_path_with! 2019-08-22 06:11:18 -04:00
Greg Lucas
7f69f15637 Fix #2192: Set default prompt hooks before loading user profile 2019-10-22 11:17:13 -04:00
Dax T. Games
468dba474e fixes 2019-10-13 15:47:25 -04:00
Dax T. Games
db42252ef2 cleanup 2019-10-13 10:18:04 -04:00
Dax T. Games
57b328b209 cleanup 2019-10-13 10:15:26 -04:00
Dax T. Games
e8b33aa45b Merge branch 'master' of https://github.com/cmderdev/cmder into fix_path_with! 2019-10-13 10:11:25 -04:00
Dax T. Games
377d97e56a fix path with ! in dir 2019-10-13 10:07:23 -04:00
Benjamin Staneck
4575ac3209 ⬆️ Update ConEmu to 190714 
Release Notes: https://conemu.github.io/en/Whats_New.html
 2019-10-12 19:45:23 +02:00
Benjamin Staneck
035f209bc4 ⬆️ Update Git to 2.23.0 
Release Notes: https://github.com/git-for-windows/git/releases/tag/v2.23.0.windows.1
 2019-10-12 19:43:46 +02:00
Dax T Games
19a2fd11e3 Clink Completions 0.3.4 (#2177) 
* update Changelog, clink-completions 0.3.4, fix ps fg color

* Update CHANGELOG.md

* Update CHANGELOG.md
 2019-09-28 02:21:47 +02:00
Dax T. Games
3a44bc809d add ~ match to vendor/clink.lua/ 2019-09-27 18:17:24 -04:00
Dax T. Games
45e5600249 update Changelog, clink 0.3.4, fix ps fg color 2019-09-26 18:07:25 -04:00
Matt Covalt
b310a2c47c
Disable clink logging 2019-08-29 12:48:52 -04:00
Dax T. Games
b58b3b4547 restore old alias.cmd without 'create' option 2019-07-07 13:52:34 -04:00
Dax T. Games
9184f8e2bf Merge branch 'master' of https://github.com/cmderdev/cmder into alias 2019-07-07 13:32:47 -04:00
Dax T. Games
1e0e2193e0 Merge branch 'master' into alias 2019-07-07 13:31:13 -04:00
Dax T. Games
38fd3468fe restore old alias.cmd without 'create' option 2019-07-07 13:30:34 -04:00
SupinePandora43
72dd8376cd move 
https://github.com/cmderdev/cmder/pull/2113#issuecomment-506044156
 2019-06-27 16:00:55 +05:00
Dax T Games
ea531cdd44 Fix post-install.bat not running and deleting itself (#2106) 
* Fix post-install.bat not running

* Changelog

* Changelog
 2019-06-03 11:23:00 +01:00
Dax T Games
865e443fcd
Merge pull request #2068 from cmderdev/history_cmd_index_sync 
Print Index in History Command Output
 2019-05-05 17:28:07 -04:00
Dax T. Games
893207453d CHANGELog 2019-05-05 17:27:25 -04:00
Dax T. Games
834f031442 Merge branch 'master' of https://github.com/daxgames/cmder into history_cmd_index_sync 2019-05-05 17:19:49 -04:00
Dax T Games
0bd847e695
Merge pull request #2083 from JoshuaWebb/master 
Close file handles in clink.lua
 2019-05-05 17:13:57 -04:00
Dax T. Games
9b9bb13f6a fix commnd line help 2019-05-05 17:06:44 -04:00
Joshua Webb
52eea5fe9f Close file handles in clink.lua 2019-04-19 16:16:45 +10:00
Dax T. Games
ab3f0b76fb fixes 2019-04-01 22:17:53 -04:00
Dax T. Games
528bbea7f5 fixes 2019-04-01 22:10:21 -04:00
Dax T. Games
f20eca01ac fixes 2019-04-01 17:34:00 -04:00
Dax T. Games
26d8d58e77 Merge branch 'master' of https://github.com/cmderdev/cmder into alias 2019-04-01 17:32:57 -04:00
Dax T. Games
cf134604bb fixes 2019-04-01 17:31:46 -04:00
Dax T. Games
67b374ad37 revert alias.cmd changes 2019-04-01 17:09:05 -04:00
Dax T. Games
d592f80364 Merge branch 'master' of https://github.com/cmderdev/cmder into alias 2019-04-01 17:04:03 -04:00
Dax T. Games
3e40c80331 new alias create syntax 2019-04-01 16:58:45 -04:00
Dax T. Games
a813e359c5 don't delete aliases by default but provide an easy way for users to do so. 2019-04-01 09:09:32 -04:00
Dax T. Games
345562dbd0 Merge branch 'ps1_prompt' of https://github.com/daxgames/cmder into ps1_prompt 2019-03-31 16:48:10 -04:00
Dax T. Games
13de4924ca make powershell use of bash commands more bash like 2019-03-31 16:47:36 -04:00
Dax T. Games
f39b921121 fixes 2019-03-31 16:11:14 -04:00
Dax T. Games
43d5a7b833 Merge branch 'master' of https://github.com/cmderdev/cmder into history_cmd_index 2019-03-31 16:04:53 -04:00
Dax T. Games
b424012a08 make debug messages more verbose 2019-03-31 09:48:58 -04:00
Dax T. Games
192c2f4dd1 fix git detection 2019-03-31 09:47:50 -04:00
Dax T. Games
0b2c9bf005 Merge branch 'ps1_prompt' of https://github.com/daxgames/cmder into ps1_prompt 2019-03-23 15:04:06 -04:00
Dax T. Games
081624d88e cleanup 2019-03-23 15:03:44 -04:00
Dax T Games
a93fff6798
Update init.bat 2019-03-17 15:09:02 -04:00
Dax T. Games
98a64b71b2 Allow full ps1 prompt customization by 'config/*.ps1' scripts 2019-03-16 13:52:47 -04:00
Dax T. Games
2582891307 Merge branch 'master' of https://github.com/cmderdev/cmder 2019-03-01 19:54:14 -05:00
Dax T Games
ec42046297
Merge pull request #2017 from b0bh00d/master 
Replaced 'hg id -ib'
 2019-03-01 14:00:22 -05:00
Dax T. Games
e75958b881 Merge branch 'master' of https://github.com/cmderdev/cmder 2019-03-01 13:47:03 -05:00
Dax T. Games
16bf572cdf Merge branch 'master' of github.com:cmderdev/cmder into git_clink_changes 2019-02-28 18:03:58 -05:00
Dax T. Games
7bd25e95e1 upgrade git to 2.21.0 2019-02-28 17:55:16 -05:00
Dax T. Games
cc12b848ac provide default settings for clink that updates the history file in real time 2019-02-28 17:44:28 -05:00
Dax T. Games
20d55c1469 all clink disable by setting CMDER_CLINK=0 befor starting task 2019-02-28 17:37:45 -05:00
b0bh00d
89499f2a60 Replaced the 'hg -id' command with the 'hg branch' and 'hg status' pair for improved response times. 2019-01-20 21:02:31 -07:00
Dax T. Games
760f4e579e ignore all /d arg if running inside vscode 2019-01-06 18:09:06 -05:00
Dax T. Games
6d8f7a290a ignore all args if running inside vscode 2019-01-06 17:46:50 -05:00
Dax T. Games
2a4e9d8301 workaround vscode tasks showing cmder debug output 2019-01-06 17:27:04 -05:00
Bob Hood
961f38a399 Updated the HG prompt (#2002) 
Per our email discussion, I have updated the HG prompt code to use the '-ib' option to 'hg id' so the branch name is always available, regardless of the state of the working copy.
 2019-01-05 19:56:30 +01:00
b0bh00d
5a48e568a8 Updated the HG prompt code to use the '-ib' option to 'hg id' to always have the branch name available. 2019-01-01 11:17:53 -07:00
Dax T. Games
9a47bce6ac fix ssh-agent in user_profile.cmd.default 2018-12-22 17:05:08 -05:00
Dax T Games
4f2ced57df
Revert "fix sshagent call in user_profile.cmd.default" 2018-12-22 16:55:56 -05:00
Dax T. Games
4e4f050374 fix sshagent call in user_profile.cmd.default 2018-12-22 15:40:09 -05:00
Martin Böhm
51e75d4bb5 add percent escaping for string.gsub (#1991) 
In `string.gsub()`, the `%` character has special meaning and must be escaped to be treated verbatim, otherwise the "invalid use of '%' in replacement string" warning will show up.

This adds a verbatim() function for that purpose. It fixes this warning for situations where `'%` characters are in the current path (cwd), version control branch names, or in the previous `PROMPT` set by the user.
 2018-12-19 21:17:45 +01:00
Dax T Games
f4389fc552
Merge pull request #1988 from daxgames/no_prefer_nix_option_ 
Prefer /nix_tools option
 2018-12-16 13:08:56 -05:00
Dax T Games
8101923242
Merge pull request #1987 from seeq12/default-files-user-profile 
Use default files for default user profiles
 2018-12-16 10:31:48 -05:00
Cody Ray Hoeft
7e1bc4297a Move ssh-agent logic to lib script 2018-12-13 21:12:18 -08:00
Dax T Games
0f30329e38
Update init.bat 2018-12-13 21:55:08 -05:00
Dax T. Games
528a69dab9 update nix_tools option to allow preferring nix tools 2018-12-13 20:54:18 -05:00
Cody Ray Hoeft
0c9e0e2f8c Use default files for default user profiles 2018-12-13 12:13:17 -08:00
Patrick Stewart
20eb7b8e81 Add /nix_tools switch to init.bat to optionally add !GIT_INSTALL_ROOT!\usr\bin to PATH 2018-12-13 16:09:52 +00:00
Dax T. Games
8ac540ebb6 debug 2018-12-02 11:51:00 -05:00
Dax T. Games
fcab51da2b remove file 2018-12-02 11:46:23 -05:00
Dax T. Games
dc492c836f Merge branch 'master' of https://github.com/cmderdev/cmder into prefer_nix_option 2018-12-02 11:46:01 -05:00
Dax T. Games
1eb03dd1b8 add '/prefer_nix' switch to init.bat 2018-12-02 11:44:18 -05:00
Van der Boon, Robert GSNL-PTT/SPD
572a94ca3a Improve LANG env var detection 2018-11-30 12:01:21 +01:00
Dax T. Games
eb6a332da2 Merge branch 'master' of https://github.com/cmderdev/cmder into multi-user 2018-11-22 16:21:24 -06:00
Daniel Chesters
036cf09360
Ensure use the system find and findstr command instead find/findstr from path. Fix #1959 2018-11-22 21:14:02 +01:00
Dax T. Games
7203671fc9 fix powershell profile.d 2018-11-17 19:55:24 -05:00
Dax T. Games
0efeaa91fa cleanup 2018-11-11 08:04:35 -05:00
Dax T. Games
e904ebce72 use user_conemu.xml or conemu-%computername%.xml directly if '-c [path]' is used to start cmder. 2018-11-10 17:26:08 -05:00
Dax T. Games
d04cc1f04e fix timer error 2018-11-10 13:57:26 -05:00
Dax T. Games
57e5ae1719 move default comemu.xml to vendor folder 2018-11-08 21:25:42 -05:00
Dax T Games
a5bdecca77 Add /f for fast init. (#1942) 
The below enables Cmder Fast Init mode for `cmd.exe` sessions.  This is more like the Cmder 1.3.5 init process.  See issue #1821 

Cmder Fast Init mode bypasses or disables the following Cmder 1.3.6+ features:

* Git root and version detection.  Defaults to `%cmder_root%\vendor\git-for-windows` if it exists.
* Path enhance validation before path modify so `%Path%` enhancements are forced.
* Recursive path add for `"%CMDER_ROOT%\bin"`
* Recursive path add for `"%CMDER_USER_BIN%\bin"` if `/c [user_config_folder` is specified.
* `/d` switch to enable debug output.
* `/v` switch to enable debug output.

Add `/f` to Cmder task as shown below t enable fast init:

_Note 1: This setting is invalid in Cmder `Powershell` and `Bash` sessions~_

_Note 2: Add `/t` also to see init timer output_

![image](https://user-images.githubusercontent.com/7318053/47957637-052e3880-df90-11e8-93ef-91e1ab696d82.png)

Cuts ~2.4 seconds off of init time.

![image](https://user-images.githubusercontent.com/7318053/47957795-45db8100-df93-11e8-8ae0-551d12c4e2dc.png)
 2018-11-04 01:36:51 +01:00
Gregory Lucas
5be25f29f8 Initialize time_init to fix init error message 2018-11-03 18:52:26 +01:00
Merlin
cb78f0486a Remove duplicate Install-Module detection 
Block was inserted twice.
 2018-11-03 02:15:03 +01:00
Dax T Games
3a11d45552 add diag helper scripts and adds to the path (#1918) 
These scripts are to help us help our users by getting a relative picture of their environment that they can submit with an incident.
 2018-11-02 14:00:40 +01:00
Nicolas Arnaud-Cormos
a607f0f2d5 Ensure the right git path is found in case of shim. 
If the git found is a shim, we need to follow the path to the actual git
directory to set the GIT_INSTALL_ROOT variable.
This happens when installing git via scoop for example.
 2018-10-10 07:14:50 +02:00
Benjamin Staneck
66da1716bc
Merge pull request #1758 from xiazeyu/master 
lib to check init.bat's custom args
 2018-09-30 18:06:42 +02:00
Benjamin Staneck
c3956e307a
Merge pull request #1889 from leochien0102/leochien0102-patch-1 
Leochien0102 Fix the 'was unexpected at this time.' at start
 2018-09-29 23:15:26 +02:00
Dax T. Games
8ff459b309 fixes 2018-09-24 19:07:48 -05:00
leochien0102
8dc9bc9ae1
fix the 'was unexpected at this time.' 
Change the single quotation marks to double while path concerned
 2018-09-21 16:01:52 +08:00
gaoslin
bb4ed4af51
Update init.bat 2018-09-18 17:26:11 +08:00
Dax T. Games
bda09bc274 init.bat update for cexec 2018-09-16 16:23:22 -05:00
Dax T. Games
749ce17dbe git prompt yellow 2018-09-16 15:53:49 -05:00
Dax T. Games
8cf59d1cbf cleanup 2018-09-16 10:21:37 -05:00
Dax T. Games
1d36ba4ed4 fix user lua and git detection 2018-09-16 10:18:10 -05:00
Dax T. Games
564ef5220e allow conditionally setting environment variables 2018-09-15 16:25:31 -05:00
Dax T. Games
f84da84e15 cleanup 2018-09-15 15:12:45 -05:00
Dax T. Games
86544c9188 readme.md 2018-09-15 15:11:50 -05:00
Dax T. Games
4aec21ce19 readme.md 2018-09-15 15:10:35 -05:00
Dax T. Games
9dce9d0f62 added exit codes 2018-09-15 13:55:54 -05:00
Dax T. Games
669e997602 flag_exists.cmd to flag_exec.cmd, also to lib as an option 2018-09-15 12:52:23 -05:00
Retomehere
0730c6e32b
Merge branch 'master' into master 2018-09-15 11:28:04 +08:00
Benjamin Staneck
0d2e16c653
Merge pull request #1871 from daxgames/user_lua 
Embed 'alias' functionality into 'vendor\bin' and Load User Lua files
 2018-09-13 22:41:19 +02:00
Benjamin Staneck
35eab7a51a
Merge pull request #1834 from b0bh00d/master 
Refactored the Mercurial prompt code to be more efficient.
 2018-09-13 18:07:07 +02:00
Benjamin Staneck
2cfa7c45fc ⬆️ ConEmu to 180626 
release notes: https://conemu.github.io/en/Whats_New.html
 2018-09-13 18:05:36 +02:00
Benjamin Staneck
ab0de6d157 ⬆️ Update Git to 2.19.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.19.0.windows.1
 2018-09-13 17:58:39 +02:00
Dax T. Games
bd9cff2691 cleanup 2018-09-05 18:07:27 -05:00
Dax T. Games
7b191d3caf cleanup 2018-09-03 14:54:52 -05:00
Dax T. Games
277972a7f2 fixed 2018-09-03 12:59:43 -04:00
Dax T. Games
ec4c815264 cleanup 2018-09-03 06:08:44 -05:00
Dax T. Games
d58c6c2070 cleanup 2018-09-02 19:17:16 -05:00
Dax T. Games
06c7cc969c Merge branch 'user_lua' into tcc 2018-09-02 19:09:49 -05:00
Dax T. Games
44b4b7a195 '.gitignore' 2018-09-02 19:09:12 -05:00
Dax T. Games
9869f9a372 cleanup 2018-09-02 18:59:14 -05:00
Dax T. Games
85c4a5b4af cleanup 2018-09-02 18:56:17 -05:00
Dax T. Games
3f96336610 verbos output 2018-09-02 18:53:49 -05:00
Dax T. Games
823eeaf082 cmder_shell settings 2018-09-02 18:18:59 -05:00
Dax T. Games
823e6fee6e add cmder_shell method 2018-09-02 17:32:20 -05:00
Dax T. Games
34f8c43d98 replace - with _ in debug-output and verbose-output 2018-09-02 09:16:40 -05:00
Dax T. Games
352a16f84d trying to get tcc working 2018-09-02 09:04:46 -05:00
Dax T. Games
541fc16daf Trying to get tcc working 2018-09-01 22:08:00 -05:00
Dax T. Games
75e6644d2a rename 2018-09-01 18:35:02 -04:00
Dax T. Games
7d40ea4609 modify message 2018-09-01 18:32:21 -04:00
Dax T. Games
451fb46ce1 move user-aliases.cmd to user_aliases.cmd 2018-09-01 18:17:09 -04:00
Dax T. Games
c25ff75187 move bin\alias.bat to vendor\bin\alias.cmd 2018-09-01 17:39:24 -04:00
Dax T. Games
059a31618b cleanup 2018-09-01 15:32:43 -04:00
Dax T. Games
e69e7f9b82 run user lua afer cmder lua 2018-09-01 14:59:40 -04:00
Dax T. Games
e93231114f Merge remote-tracking branch 'origin' into user_lua 2018-09-01 14:35:41 -04:00
Benjamin Staneck
08550751da
Merge pull request #1860 from gucong3000/lang 
Add %LANG% support
 2018-09-01 00:32:02 +02:00
Dax T Games
49da3745bc Fix #1806 #1675 (#1870) 
## Rename user-profile.* user_profile.* to resolve #1806, #1675

* This is a backward compatible fix and will automatically and silently rename users '%cmder_root%/config/user-profile.\*' to '%cmder_root%/config/user_profile.\*' and '[user_specified_config_root]/user-profile.\*' to '[user_specified_config_root]/user_profile.\*' if the sources exist.

  * Cmder.exe does this for cmd.exe sessions.
  * The init scripts for bash and Powershell handles it for these shells
 2018-09-01 00:02:56 +02:00
Benjamin Staneck
e4fb0d694b Revert "replace user-aliases with user_aliases" 
This reverts commit d91438de47.
 2018-08-31 18:41:06 +02:00
Benjamin Staneck
798da058cc
Merge pull request #1865 from m01ar/master 
Dot-Sourcing Error: PowerShell 5.1 and Windows Software Restriction Policy compatibility
 2018-08-30 15:24:38 +02:00
Benjamin Staneck
d91438de47 replace user-aliases with user_aliases 2018-08-30 15:22:33 +02:00
Dmitri S. Guskov
34bb62409a
Update profile.ps1 
Fixes Powershell 5.1 error when Windows Software Restriction Policy is enabled:

bin\vendor\profile.ps1 : Cannot dot-source this command because it was defined in a different language mode. To invoke this command without importing its contents, omit the '.'  operator.
At line:1 char:1
+ . 'bin\vendor\conemu-maximus5\..\profi ...
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : InvalidOperation: (:) [profile.ps1], NotSupportedException
    + FullyQualifiedErrorId : DotSourceNotSupported,profile.ps1
 2018-08-29 14:38:59 +03:00
刘祺
b901a4a569 add LANG support 2018-08-23 11:57:16 +08:00
xiazeyu
39f47870a3
chore: unite slash 2018-08-06 16:05:31 +08:00
Retomehere
192056e19b
Merge branch 'master' into master 2018-08-06 13:14:45 +08:00
xiazeyu
f6c2d9c31e
refactor: reduce global varible useage, fixed quote issue, added parameters support 2018-08-06 13:09:59 +08:00
Bob Hood
0f99f66b42 Refactored the Mercurial prompt code to be more efficient. 2018-07-06 14:34:48 -06:00
Benjamin Staneck
e3cdf43afc better fix for #1265 2018-06-07 18:29:48 +02:00
Benjamin Staneck
6c016788d4 Revert "sanitize dir before assigning to prompt" 
This reverts commit 0b2d7bd655.
 2018-06-07 17:04:06 +02:00
Benjamin Staneck
0b2d7bd655 sanitize dir before assigning to prompt 
Fixes #1265
 2018-06-07 16:08:53 +02:00
Dax T Games
27f51f48a4 Profile.ps1 (#1796) 
* Fix GIT_INSTALL_ROOT again

* fix profile.ps1
 2018-06-03 00:15:33 +02:00
Dax T Games
4df1d744d3 Fix lib base (#1794) 
* Fix GIT_INSTALL_ROOT again

* fixed lib_base error

* fix lib help

* fix lib help
 2018-05-31 14:35:02 +02:00
Dax T. Games
19d5a87224 Fix GIT_INSTALL_ROOT again 2018-05-30 01:04:41 +02:00
Benjamin Staneck
44aadccbec ⬆️ ConEmu to 180528 
release notes: https://conemu.github.io/en/Whats_New.html
 2018-05-29 22:42:32 +02:00
Benjamin Staneck
83f411384c ⬆️ Update Git to 2.17.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.17.1.windows.2
 2018-05-29 22:37:21 +02:00
xiazeyu_2011
861f99d64b
rename /bin/have.bat to /vendor/lib/flag_exists.cmd 
Please use %flag_exists% instead of using have
 2018-05-27 10:22:44 +08:00
Retomehere
0c39d0a799
Merge branch 'master' into master 2018-05-18 20:37:19 +08:00
xiazeyu_2011
bf6dae4a24
feat: add have.bat as a wrapper 2018-05-18 20:32:05 +08:00
xiazeyu_2011
daa94c5462
Optimize comments of using arguments in user-profile.cmd 2018-05-04 20:14:40 +08:00
Dax T Games
9a3a8f23d0
Little Changes 2018-05-01 08:57:02 -04:00
xiazeyu_2011
99f51b0fc0 fix conflict with init.bat build-in command parser, update user-profile.cmd 2018-05-01 13:02:21 +08:00
xiazeyu_2011
a06d4e93ec Pass arguments to user-profile.cmd 2018-04-30 20:31:01 +08:00
Dax T Games
13ea026dc9
Fix git install root 
This is untested so don't merge yet.  I'll test tonight.
 2018-04-26 19:06:18 -04:00
Benjamin Staneck
dc8e572ca5 ⬆️ ConEmu to 180416 
release notes: https://conemu.github.io/en/Whats_New.html
 2018-04-19 09:07:55 +02:00
Benjamin Staneck
b2262522c9 ⬆️ Update Git to 2.17.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.17.0.windows.1
 2018-04-13 20:20:59 +02:00
Benjamin Staneck
9d0729fe42 ⬆️ ConEmu to 180411 
release notes: https://conemu.github.io/en/Whats_New.html
 2018-04-13 20:20:59 +02:00
Dax T. Games
2a18ba084c fix spelling 2018-04-12 21:43:31 -04:00
Dax T. Games
b8890ed297 switch to debug output 2018-04-12 21:39:52 -04:00
Dax T. Games
063f30c193 fix git missing error on cmder mini cmd shell 2018-04-12 21:32:38 -04:00
Dax T. Games
bc72f20a2d reposition echo 2018-04-12 21:06:00 -04:00
Benjamin Staneck
7294092618 fix a typo 2018-04-06 00:00:11 +02:00
Dax T. Games
65bf25f1d0 fix bash and powershell init scripts 2018-04-03 14:17:34 -04:00
Dax T. Games
864f778099 load user clink 2018-03-24 08:03:28 -05:00
Benjamin Staneck
72ab0f064f update psget to the latest version 2018-03-24 00:01:08 +01:00
Benjamin Staneck
0438ce5763 ⬆️ Update Git to 2.16.3 
Release notes: https://github.com/git-for-windows/git/releases/v2.16.3.windows.1
 2018-03-23 23:11:05 +01:00
Dax T Games
471369f73b Made all sub-routines in init.bat importable libs (#1706) 2018-03-23 15:20:07 +01:00
Benjamin Staneck
17247f2065 ⬆️ ConEmu to 180318 
release notes: https://conemu.github.io/en/Whats_New.html
 2018-03-19 20:57:10 +01:00
Dax T Games
997e799138 New cmder.exe args and shared install capability (#1696) 
@MartiUK: Squashing to avoid adding multiple "fixed" commits

* add args to init.bat

* adding args to cmder launcher

* reworked command line parsing and added a /C [path] arg for individual user config location

* removed unnecessary includes

* make shell init scripts work with CMDER_USER_CONFIG

* update tasks and readme.md

* fix git version check

* readme updates

* add register/unregister back in

* fixed git version again

* removed error if user defines user-aliases store file was not present an init.bat launch

* added enhance_path method to only update path if required

* added enhance_path method to only update path if required

* fixed a path prepend issue in enhance path

* init.bat with args is executed outside cmder/conemu sets cmder_root properly. Thanks @DRSDavidSoft

* fixed enhance path append issue

* implements recursive `/bin` path enhancing.

https://github.com/cmderdev/cmder/issues/1624

* added max depth

* changes command line arg to max_depth

* set max_depth default

* readme.md updates

* add back cmder /c [path] arg so it can be used with admin sessions since the env is not shared.

* readme.md updates

* fix /c setting of cmder_user_config

* changelog and readme

* remove bad arg

* fixed command line parsing and updated command line help on error

* Fixed ConEmu.xml file handling so it works again

* Added default user config root location if '/c' is specified and next arg is not another arg
 2018-03-13 16:38:27 +01:00
David Refoua
ff2e09849e simplified λ prompt in lua (#1693) 
* replace lambda with $

* simplified $ prompt

The $ character for the prompt is defined only once instead of twice

* fixed λ prompt
 2018-03-08 12:01:48 +01:00
David Refoua
8237b1010c Detect and compare installed Git version against vendored Git (#1658) 
* Replaced the git version comparison mechanism with actual version comparing
* Add notes regarding the git comparison method

Added a simple mechanism to call and compare the user installed git version against the vendored git version, rather than checking if the `git.exe` executable is located in a `/bin` directory.

This fixes false warnings by actually testing if the user installed git is older, or more recent.

Added a small note regarding how the `init.bat` works, and where to put custom `git.exe` binaries as well as where to find the Minified Cmder.
 2018-02-22 19:20:08 +00:00
Benjamin Staneck
cf311fb1c2 ⬆️ Update Git to 2.16.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.16.2.windows.1
 2018-02-20 20:20:23 +01:00
Benjamin Staneck
a49c1b3f3d ⬆️ ConEmu to 180206 
release notes: https://conemu.github.io/blog/2018/02/06/Build-180206.html
 2018-02-11 18:09:47 +01:00
Benjamin Staneck
fff6e4506c ⬆️ Update Git to 2.16.1(4) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.16.1.windows.4
 2018-02-11 18:07:40 +01:00
Benjamin Staneck
a71c6a50ad always close open file handles 
Fixes #1619
 2018-01-16 21:59:11 +01:00
Benjamin Staneck
5e703796c9 git should no longer require extra file closing after the recent changes 2018-01-09 14:52:48 +01:00
Benjamin Staneck
b88a01822f re-order git/hg/svn functions 2018-01-09 14:52:48 +01:00
David Driscoll
badb027c24 use /dir Switch instead of CMDER_START 2018-01-09 14:50:46 +01:00
Benjamin Staneck
145a1b144b Fix for the last 2018-01-06 23:52:24 +01:00
Benjamin Staneck
29c5e83975 Replace --no-lock-index with the new --no-optional-locks 2018-01-06 23:43:50 +01:00
Benjamin Staneck
1c02c55c2f ⬆️ ConEmu to 171226 
release notes: https://conemu.github.io/blog/2017/12/26/Build-171226.html
 2017-12-28 14:21:28 +01:00
Benjamin Staneck
74fc14eadf ⬆️ ConEmu to 171217 
release notes: https://conemu.github.io/blog/2017/12/17/Build-171217.html
 2017-12-22 17:23:56 +01:00
Benjamin Staneck
0729c06c20 switch back to the official version of clink 2017-12-22 17:23:56 +01:00
Benjamin Staneck
bafaf7cba4 oops, fix download url 2017-11-30 10:13:25 +01:00
Benjamin Staneck
3c14d19a27 ⬆️ Update Git to v2.15.1(2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.15.1.windows.2
 2017-11-30 10:05:46 +01:00
Benjamin Staneck
13941a44ec ⬆️ Update Git to v2.15.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.15.1.windows.1
 2017-11-29 23:54:39 +01:00
Martin Kemp
ee4f85de85
Merge pull request #1416 from gucong3000/patch-1 
Compatible with Visual Studio Code (cmd)
 2017-11-29 13:43:13 +01:00
Tony Lin
9d6e5c12a2 Fix startup folder issue 2017-11-13 19:33:03 +01:00
Benjamin Staneck
da27f9be9f ⬆️ ConEmu to 171109 
release notes: https://conemu.github.io/blog/2017/11/09/Build-171109.html
 2017-11-12 00:35:42 +01:00
Benjamin Staneck
124565f36a switch to the 64bit version of Git for Windows 2017-11-03 15:06:27 +01:00
Benjamin Staneck
46d468aea0 touch up clink.lua 2017-11-03 13:13:51 +01:00
Martin Kemp
dc27c53739
⬆️ Update git-for-windows to v2.15.0.windows.1 2017-11-01 11:32:18 +00:00
Jack
7479d620b1
Merge pull request #1417 from gucong3000/patch-2 
Compatible with Visual Studio Code (PowerShell) integrated terminal.
 2017-10-31 21:09:23 +00:00
Benjamin Staneck
a8d32611a9 Fix lamda color after a ConEmu change 
Seems like https://github.com/Maximus5/ConEmu/issues/1288 caused this
 2017-10-29 10:46:38 +01:00
Pero Pejovic
68d9425c89 Avoid using aliases in profile.ps1 
Aliases such as `ls` may have been overridden in the user's profile script and the resulting behavior may be different from `Get-ChildItem`. For example binding `ls` to GNU `ls.exe` generates an error if there are no matching files.
 2017-10-28 14:18:09 +02:00
Benjamin Staneck
a95cd140ef ⬆️ Update ConEmu to 171025 (alpha) 
Changelog: https://conemu.github.io/blog/2017/10/25/Build-171025.html
 2017-10-28 12:30:54 +02:00
Benjamin Staneck
e90966c5c2 ⬆️ Update Git to v2.14.4 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.3.windows.1
 2017-10-28 12:29:46 +02:00
Benjamin Staneck
e104f20c5d ⬆️ clink-completions to 0.3.3 
Changelog: https://github.com/vladimir-kotikov/clink-completions/releases/tag/0.3.3
 2017-10-28 12:28:31 +02:00
Benjamin Staneck
6883ba3b84 ⬆️ Update ConEmu to 170910 (alpha) 
Changelog: https://conemu.github.io/blog/2017/09/10/Build-170910.html
 2017-09-30 11:36:03 +02:00
Benjamin Staneck
1c1c08bb68 ⬆️ Update Git to v2.14.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.2.windows.1
 2017-09-30 11:36:03 +02:00
Benjamin Staneck
8d74184d30 ⬆️ clink to our forked version at 0.4.9 
This should fix all the Windows 10 alias issues that we had.
 2017-08-28 00:50:52 +02:00
Dax T Games
3ea6d51ba4 Update init.bat 2017-08-27 14:04:24 -05:00
Hugo-KTM
22d27afed5 Fix Cmder not changing to CMDER_START (#1399) 
* Fix Cmder not changing to CMDER_START

Fix to allow Cmder to change to different startup directory if already on the same drive as CMDER_START
possibly relevant: HOME != USERPROFILE

* make "Cmder Here" work in more cases

integrated suggestion from comments (test for trailing backslash to prevent doubling of trailing backslash)
integrated suggestions from #1456: switching ```cd /d``` over to ```pushd``` to get support for UNC-paths

* replaced 'cd /d' with 'pushd'

replaced two more instances of 'cd /d' with 'pushd' to support network paths.
Also added double quotes to the use of '%USERPROFILE%' to prevent issues with spaces.
I also noticed that 'pushd', in contrast to 'cd /d' does not require the trailing backslash for drive roots (on Win7). Therefore I removed the trailing backslash check.

* Don't assume / is needed at end

* Update init.bat
 2017-08-27 19:46:47 +02:00
Benjamin Staneck
e9a78a30d1 ⬆️ Update Git to v2.14.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.1.windows.1
 2017-08-10 22:34:46 +02:00
Benjamin Staneck
e92f7fbb55 ⬆️ Update Git to v2.14.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.14.0.windows.1
 2017-08-06 02:41:07 +02:00
刘祺
7ca2f5503a Merge branch 'master' into patch-2 
# Conflicts:
#	vendor/profile.ps1
 2017-08-03 18:32:44 +08:00
Alpha
1f9e743ef2 Added pagent ssh auth support (#1391) 
(and some comments on the user-profile.cmd file)

Inspired by the comments from https://github.com/cmderdev/cmder/issues/193 and my personal need to use pageant instead of OpenSSH authentication agents (which is more Window user-friendly), I have used this approach which works as expected.

Keeping the spirit of the current scripts, I left it disabled, and with some comments explaining what they all do.
 2017-07-24 23:16:10 +02:00
Benjamin Staneck
4c270699a1 ⬆️ Update Git to v2.13.3 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.3.windows.1
 2017-07-15 23:06:05 +02:00
Benjamin Staneck
8077c1a612 Merge pull request #1441 from pyranja/fix-psget-clobbering 
Avoid clobbering Install-Module
 2017-07-15 02:08:09 +02:00
Chrs Borckholder
815b99b98b Avoid clobbering Install-Module 
If the Install-Module command is available, do not include the bundled
module path containing a deprecated version of PSGet. Recent powershell
versions include PowerShellGet as standard module installer.

Resolve #1318.
 2017-07-14 12:06:48 +02:00
Dax T. Games
bcb60f8f59 cmder git prompt spacing 2017-07-10 22:23:51 -05:00
Dax T. Games
0877a6d995 cmder git prompt 2017-07-10 22:21:22 -05:00
Benjamin Staneck
512787f391 ⬆️ Update ConEmu to 170622 (preview) 
Changelog: https://conemu.github.io/blog/2017/06/22/Build-170622.html
 2017-06-27 00:56:53 +02:00
Benjamin Staneck
262d92265e ⬆️ Update Git to v2.13.2.windows.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.2.windows.1
 2017-06-27 00:55:58 +02:00
Benjamin Staneck
aea1a977bf ⬆️ Update Git to v2.13.1(2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.1.windows.2
 2017-06-23 18:18:21 +02:00
刘祺
a7237370e3 Compatible with Visual Studio Code (PowerShell) 2017-06-23 18:39:36 +08:00
刘祺
25005930ba Compatible with Visual Studio Code 2017-06-23 17:48:03 +08:00
Benjamin Staneck
89c014bb05 ⬆️ Update Git to v2.13.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.1.windows.1
 2017-06-13 15:11:43 +02:00
Benjamin Staneck
c19237085d ⬆️ Update ConEmu to 170605 (preview) 
Changelog: https://conemu.github.io/blog/2017/06/05/Build-170605.html
 2017-06-13 15:10:55 +02:00
Benjamin Staneck
9c4e77b498 ⬆️ Update ConEmu to 170517 (preview) 
Changelog: https://conemu.github.io/blog/2017/05/17/Build-170517.html
 2017-05-19 23:20:31 +02:00
Benjamin Staneck
c2cf56cc48 ⬆️ Update Git to v2.13.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.13.0.windows.1
 2017-05-10 22:03:36 +02:00
Benjamin Staneck
399999d7f7 Merge pull request #1299 from alexandr-san4ez/master 
Changed the way directory is defined .git
 2017-04-07 02:42:18 +02:00
Benjamin Staneck
8eea2baaa5 Merge pull request #1331 from dancread/svn-prompt 
Adding svn support to prompt
 2017-04-07 02:40:35 +02:00
Benjamin Staneck
4d3950174f ⬆️ Update ConEmu to 170402 (preview) 
Changelog: https://conemu.github.io/blog/2017/04/02/Build-170402.html
 2017-04-07 02:38:16 +02:00
Benjamin Staneck
24a110ddb7 ⬆️ Update Git to v2.12.2(2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.2.windows.2
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
1dd0e600ac ⬆️ Update ConEmu to 170326 (preview) 
Changelog: https://conemu.github.io/blog/2017/03/26/Build-170326.html
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
e49b978b9a ⬆️ Update Git to v2.12.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.2.windows.1
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
9182c89a14 ⬆️ Update ConEmu to 170316 (preview) 
Changelog: https://conemu.github.io/blog/2017/03/16/Build-170316.html
 2017-04-07 02:36:32 +02:00
Benjamin Staneck
00622254a7 ⬆️ Update Git to v2.12.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.1.windows.1
 2017-04-07 02:36:32 +02:00
dr024625
9977c0563d Adding svn support 2017-04-03 21:07:41 -05:00
Shahzeb Ihsan
d8444dae97 Set history_io=3 in default Clink settings 
Currently the "history" command in Cmder prints commands without any index associated with any command, so you can copy/paste a command or use "!!" to execute a command from the history but, unlike BASH, you can't do "!<command_index>".

"cat" has a switch, "-n", which prints line numbers of the file being printed. This, in conjunction with "history_io=3" in Clink settings (to read/write history when editing a command") works just like BASH, i.e., you can use the index printed next to a command in the history to execute that command as "!<command_index>".
 2017-03-17 10:59:12 +08:00
Shahzeb Ihsan
0a5d1ac156 Use cat -n for printing history to show cmd index 
Currently the "history" command in Cmder prints commands without any index associated with any command, so you can copy/paste a command or use "!!" to execute a command from the history but, unlike BASH, you can't do "!<command_index>".

"cat" has a switch, "-n", which prints line numbers of the file being printed. This, in conjunction with "history_io=3" in Clink settings (to read/write history when editing a command") works just like BASH, i.e., you can use the index printed next to a command in the history to execute that command as "!<command_index>".
 2017-03-17 10:26:57 +08:00
Alexandr
018cc9ceda Changed the way directory is defined .git 
clink.find_dirs - do not specify the directory if there is Cyrillic in the way.
clink.is_dir - more logical and faster.
 2017-03-09 19:22:13 +03:00
Jack
ad0f8fe049 Merge pull request #1280 from bdukes/patch-1 
Allow profile.d/*.ps1 files to export [scriptblock]$prompt override all of cmders prompt
 2017-03-08 22:06:50 +00:00
Brian Dukes
7f4a4d34d6
Allow user-profile.ps1 and profile.d/*.ps1 files to override prompt 
This defines the default prompt variables ($PrePrompt, $PostPrompt,
$CmderPrompt, and $Prompt) before running the custom scripts (user-profile.ps1
and profile.d/*.ps1), and then saves those prompt values after running the
custom scripts.  This gives the custom scripts and opportunity to override the
prompt code blocks.

This now opens the possibility for profile.d/*.ps1 scripts to affect the
prompt, and also allows both user-profile.ps1 and profile.d/*.ps1 scripts to
overwrite the $Prompt script block and overwrite the prompt behavior entirely.
 2017-03-08 14:14:35 -06:00
Benjamin Staneck
963a5a8be6 ⬆️ Update Git to v2.12.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.12.0.windows.1
 2017-03-01 04:01:24 +01:00
Benjamin Staneck
81d83d4c6d ⬆️ Update Git to v2.11.0.3 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.11.0.windows.3
 2017-01-16 08:53:56 +01:00
Benjamin Staneck
61849dc7fd ⬆️ Update ConEmu to 161206 (stable) 
Changelog: https://conemu.github.io/blog/2016/12/06/Build-161206.html
 2016-12-08 22:53:08 +01:00
Benjamin Staneck
7447e00aec ⬆️ Update Git to v2.11.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.11.0.windows.1
 2016-12-01 21:06:29 +01:00
Benjamin Staneck
84202729fb Merge pull request #1169 from cmderdev/development 
Development
 2016-11-19 23:41:54 +01:00
Benjamin Staneck
70b0666f11 ⬆️ Update Git to v2.10.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.2.windows.1
 2016-11-19 23:40:05 +01:00
Benjamin Staneck
14f3361429 ⬆️ Update ConEmu to 161022 (stable) 
Changelog: https://conemu.github.io/blog/2016/10/22/Build-161022.html
 2016-11-19 23:39:07 +01:00
Florian Anderiasch
ba99f5b66a Fix typo in init.bat 2016-11-10 18:04:37 +01:00
Vladimir Kotikov
a0e0adae8b Bump clink-completions to 0.3.2 2016-11-07 00:56:13 +01:00
Benjamin Staneck
46d5936806 ⬆️ Update Git to v2.10.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.2.windows.1
 2016-11-04 00:27:46 +01:00
Benjamin Staneck
e6d4609bf4 ⬆️ Update ConEmu to 161022 (stable) 
Changelog: https://conemu.github.io/blog/2016/10/22/Build-161022.html
 2016-10-23 22:24:07 +02:00
Benjamin Staneck
0de26571aa ⬆️ Update Git to v2.10.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1
 2016-10-23 22:23:58 +02:00
Martin Kemp
5597aa6038 Merge pull request #952 from Jackbennett/custom-prompt 
Custom prompt hooks protected from later overwriting
 2016-10-19 14:08:09 +01:00
刘祺
eb73f6f772 fix error when path has a space 2016-10-11 14:41:47 +08:00
Jackbennett
db909451c9 Version Check the Posh-Git module to allow module autoloading 
Posh-Git before this release does not export `Write-VcsStatus` thus
powershell's autoloading cannot find the reqired module for the function.

note that `get-module -listAvailable` can return an array of multiple
versions.
 2016-10-10 12:01:55 +01:00
Jackbennett
b349b19869 Describe why PS functions are called by namespace 
As the prompt function is called all the time, specifically namespace the
cmldets it uses to avoid them being hijacked in the user session.
 2016-10-10 10:30:01 +01:00
Benjamin Staneck
44e0a040bd ⬆️ Update Git to v2.10.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1
 2016-10-05 02:16:22 +02:00
Alexandr
c8adf424e2 Added closing process in get_git_status (#1) 
After execution command: git add * git continues to operate without closing. The process does not stop.
 2016-09-27 22:59:09 +02:00
Alexandr
27c571636d Added closing process in get_git_status (#1) 
After execution command: git add * git continues to operate without closing. The process does not stop.
 2016-09-27 18:48:23 +03:00
Benjamin Staneck
d144cd0fc2 ⬆️ Update ConEmu to 160914 (stable) 
Changelog: https://conemu.github.io/blog/2016/09/14/Build-160914.html
 2016-09-17 22:49:23 +02:00
Benjamin Staneck
bb312ad74b try --no-lock-index for Git 2016-09-17 22:48:02 +02:00
Benjamin Staneck
df7beff2ef ⬆️ Update ConEmu to 160828 (stable) 
Changelog: https://conemu.github.io/blog/2016/08/28/Build-160828.html
 2016-09-03 10:52:17 +02:00
Benjamin Staneck
b7bfe72303 ⬆️ Update Git to v2.10.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.0.windows.1
 2016-09-03 10:50:34 +02:00
Benjamin Staneck
490fae770c ⬆️ Update Git to v2.9.3 (2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.9.3.windows.2
 2016-08-25 21:51:17 +02:00
Benjamin Staneck
355df7a48a Merge pull request #1078 from orionlee/fix_bash_login_when_cmder_root_has_spaces 
Fix bash login when $CMDER_ROOT has spaces
 2016-08-21 20:23:20 +02:00
orionlee
5354b5f80f Further fix bash login when ${CMDER_ROOT} has spaces. 
Inspecting the script uncovers similar problems elsewhere
not encountered in my initial testing. They are fixed accordingly.
 2016-08-20 16:01:46 -07:00
orionlee
d095d6afd6 Fix bash login when ${CMDER_ROOT} has spaces. 
E.g., if ${CMDER_ROOT} is /c/Users/Foo Bar/cmder,
the following errors will occur:
  bash: pushd: /c/Users/Foo: No such file or directory
  bash: [: /c/Users/Foo: binary operator expected
  bash: /c/Users/Foo: No such file or directory
 2016-08-20 15:56:49 -07:00
Benjamin Staneck
832c1991e4 Merge pull request #1070 from janschulz/unicode_path_prompt 
Parse the original prompt for cwd and env names
 2016-08-15 16:40:35 +02:00
Benjamin Staneck
19672aafff ⬆️ Update Git to v2.9.2 
Release notes: https://github.com/git-for-windows/git/tree/v2.9.3.windows.1
 2016-08-14 04:59:27 +02:00
Jan Schulz
6b10771312 Parse the original prompt for cwd and env names 
clink.get_cwd() is returning a string which is differently encoded than what
clink.prompt.value expects. This results in garbled path names if the path
condains non-ASCII chars. The (arguable hacky) solution is to parse the old
prompt for the current directory (which breaks if the user sets a PROMPT env var
which is incompatible to the regex used here...).

Also parse out a environment name set by systems like virtualenv or conda: this
could be done more specifically by targeting each such system and using the
usually set environment variable but this would mean that we would have to do
that for each and every such system out there and that is probably not a sane
idea...
 2016-08-09 13:45:36 +02:00
Benjamin Staneck
13fd41eb82 change how we ask hg for the status 
closes #1035
Thanks @raleighr3
 2016-07-30 00:36:32 +02:00
Benjamin Staneck
f2641e4cd2 ⬆️ Update Git to v2.9.2 2016-07-17 01:09:06 +02:00
Benjamin Staneck
4e90303511 ⬆️ Update ConEmu to 160710 (stable) 
Changelog: https://conemu.github.io/blog/2016/07/10/Build-160710.html
 2016-07-14 09:19:01 +02:00
Benjamin Staneck
393d7d19c5 ⬆️ Update clink to 0.4.8 2016-07-14 07:53:13 +02:00
Benjamin Staneck
924ab12aeb we don't need a second function for that. 2016-06-30 02:53:00 +02:00
Łukasz Papierz
9c0ad9fd81 Fix git branch name colouring 
Colouring fixed when there are some changes in a branch
 2016-06-28 14:13:35 +02:00
Jan Schulz
a542f4e20c cmd: change the prompt in lua 
This keeps the PROMPT variable as is and changes the prompt to the cmder style
in the clink code.

This has two advantages:

* opening a cmd in a cmder session will now show the old prompt code instead of
  a ugly raw prompt without the replacements. This led to ugly output when a
  batch file echoed their content (e.g `conda build recipe/`).

* when a command rewrites the prompt (e.g. an activate in a virtualenv), these
  command sometimes simply overwrites the PROMPT so that the cmder enhancements
  were not anymore in place. Now we simply don't care and overwrite it with our
  stuff in the clink part. This might mean that a user has to install a lua
  script so that e.g. conda environments are visible on the prompt.
 2016-06-21 13:33:49 +02:00
Benjamin Staneck
999b5af29a ⬆️ Update ConEmu to 160612 (stable) 
Changelog: https://conemu.github.io/blog/2016/06/12/Build-160612.html
 2016-06-14 18:21:40 +02:00
Benjamin Staneck
87210ae7ca ⬆️ Git to 2.9.0 
Changelog: https://github.com/git-for-windows/git/tree/v2.9.0.windows.1
 2016-06-14 17:34:19 +02:00
Vladimir Kotikov
6a080a1284 Bump clink-completions to 0.3.1 2016-06-11 01:07:47 +03:00
Benjamin Staneck
d014d785b0 ⬆️ Update to Git to 2.8.4 2016-06-09 00:18:56 +02:00
Jan Schulz
c19412045c Fix git branch name never shown as dirty 
The problem was that io.popen() returns a file and not the return code of the
called program.

The new code was inspired by
http://stackoverflow.com/a/14031974/1380673
 2016-06-02 12:45:07 +02:00
Jackbennett
010049a849 Set window title to current folder unless there's git information. 
Unfortunately doesn't apply to conEmu's tab name.
 2016-05-27 09:47:34 +01:00
Jackbennett
7a0a1adc02 Use checkGit to hold the git state. Import posh-git at the last minute. 
Import-Git now finds if the module isn't installed at all and alerts the
user. But only when in a git folder.
 2016-05-23 14:53:34 +01:00
Jackbennett
76b2ed510d If you start doing remote work you can fire off your own start-sshAgent command. 2016-05-23 14:51:55 +01:00
Benjamin Staneck
7ca9d8e9d6 Update ConEmu to 160515 2016-05-17 23:20:16 +02:00
Jackbennett
31c8c620c7 Custom prompt hooks protected from later overwriting 
Add a pre and post function hook around the Cmder prompt.
Specify the cmder prompt as a function that could be replaced by a user.
Write a friendly message when the user profile template is created.
Create the user profile with cmder prompt hooks ready to use.

It was concerning to run any function with a specific name every prompt
with no guarantee it remains what it was initally created as.

Core functions have been explicitly called from their
namespace like Microsoft.PowerShell.Utility\Write-Host to try and prevent
clobbering.

User supplied functions are passed in as script blocks, created as the
session runs the profile script. By creating them as constants these
function names cannot be declared again for the duration of the process.

Since the prompt function already exists by this time, set the readOnly
flag so to re-declare the prompt requires the use of -force.

It is hoped these changes limit what could be the risk of any script
redefining functions that are called automatically without user intent or
input.
 2016-05-12 13:59:33 +01:00
Benjamin Staneck
61e795c02d Merge pull request #945 from daxgames/fix_aliases_update 
Added :verbose-output subroutine, made aliases update more functional
 2016-05-08 15:56:58 +02:00
Vladimir Kotikov
a286e52a44 Update completions to 0.3.0 2016-05-08 02:42:48 +03:00
Dax T. Games
c49c27fb88 allow setting verbose-output variable outside init.bat 2016-05-07 18:10:44 -05:00
Dax T. Games
e212ee36a2 Added :verbose-output subroutine, made aliases update more functional 2016-05-07 14:32:33 -05:00
Dax T. Games
537c658eb4 fixed git not working in cmder cmd session and added some comments 2016-05-07 10:56:08 -05:00
Benjamin Staneck
4e9882eea4 Update Git to 2.8.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.8.2.windows.1
 2016-05-06 18:10:00 +02:00
Jan Schulz
055a974257 More variable quoting in init.bat 
There were problems when a path contained a parenthesis like `C:\temp\test (test)\`

As a precaution, quote all variables when they are used in echo or set.
 2016-05-06 15:12:07 +02:00
Jan Schulz
1bf5503bea Add quotes around all variables 
This should prevent errors like
https://github.com/cmderdev/cmder/issues/935
https://github.com/cmderdev/cmder/issues/937

I've no idea why this happens, but it shouldn't hurt anyway...
 2016-05-05 22:40:33 +02:00
Jan Schulz
6c6268e968 Remove @ in new code, echo off is enough 2016-04-08 16:55:49 +02:00
Jan Schulz
1e7f15100f PS: also add cmd and bin version of git to the path 
This ensures that the "normal" path entry (cmd) is first and bash is still reachable via the bin path.
 2016-04-08 16:53:38 +02:00
Jan Schulz
fbccc6b790 init.bat: remove GIT\bin from path 
The only reason was bash but bash.exe is also in <GIT>\usr\bin.
 2016-04-08 16:53:38 +02:00
Jan Schulz
2ccc06e639 init.bat: integrate the unix commands at the end of PATH 
Some unix commands shadow windows commands and therefor the unix commands should
be at the end of the PATH
 2016-04-08 16:53:38 +02:00
Jan Schulz
182629d59a init.bat: check for git in path 
The idea is:
* if the users points as to a specific git, use that
* test if a git is in path and if yes, use that
* last, use our vendored git

We don't make any attempt to guess a different location, if a user wants their
own git install, they have to choose "add git to path".

Also check that we have a recent enough version of git (e.g. test for
<GIT>\cmd\git.exe)
 2016-04-08 16:51:53 +02:00
Dax T. Games
24b1bb93c0 upgraded git to 2.8.1 2016-04-05 14:27:12 -05:00
Benjamin Staneck
5a1f81655f ⬆️ ConEmu@160328 
Changelog: https://conemu.github.io/en/Whats_New.html
 2016-03-30 03:02:31 +02:00
Benjamin Staneck
07ed31c0a1 ⬆️ Git@2.8.0.windows.1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.8.0.windows.1
 2016-03-30 03:00:59 +02:00
Dax T. Games
86dd077b9d fixed - not running user-aliases.cmd if aliases variable is overridden in profile.d 2016-03-21 14:35:48 -05:00
Dax T. Games
b86f3fbaff synced with upstream/development 2016-03-20 08:30:20 -05:00
Benjamin Staneck
3ca847fc42 ⬆️ Git@2.7.4.windows.1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.4.windows.1
 2016-03-18 18:20:06 +01:00
Benjamin Staneck
0de643be42 ⬆️ Git@2.7.2.windows.1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.3.windows.1
 2016-03-17 03:33:09 +01:00
Martin Kemp
05c113efee Fix PSReadline clearing directory prompt. 
If user has PSReadline and is using it be sure to clear 1 less line to prevent the directory prompt from being cleared.

Fixes #879
 2016-03-10 10:50:37 +00:00
Dax T. Games
01667a5bf0 Process profile.d scripts before adding user aliases 2016-03-07 08:12:50 -06:00
Dax T. Games
3085fca9e0 synced with upstream/development 2016-03-06 17:27:27 -06:00
Benjamin Staneck
06c6e5fdb6 Merge pull request #873 from daxgames/echo_off 
Prefer use of first line @echo off vs. @ per line to turn off echo pe…
 2016-03-07 00:07:25 +01:00
Dax T. Games
0f4292aa08 Prefer use of first line @echo off vs. @ per line to turn off echo per line. - Cleaner file, no side efects 2016-03-06 15:40:06 -06:00
Dax T. Games
722f8b7745 silenced bash profile.d when profile.d is empty 2016-03-06 15:05:40 -06:00
Dax T. Games
8dbbb902d9 fixed vendor\profile.ps1 profile.d - added post popd 2016-03-02 18:04:25 -06:00
Dax T. Games
d6eec2f3a5 silence profile.d if profile.d is empty 2016-03-02 17:37:28 -06:00
Dax T. Games
32c1d4028a added fully qualified path to cmd profile.d section 2016-03-02 15:17:43 -06:00
Dax T. Games
997bd5c24e Enhanced alias.bat to allow file storage path 2016-03-01 21:08:08 -06:00
Dax T. Games
8a5c58e626 fixed cmd profile.d support 2016-03-01 20:35:55 -06:00
Martin Kemp
8fa151d1db Merge pull request #740 from daxgames/cmder_exinit 
Cmder exinit
 2016-02-29 08:11:34 +00:00
Dax T. Games
59e4a1684b Merge branch 'development' of https://github.com/cmderdev/cmder into profile.d_support 2016-02-27 12:52:00 -06:00
Dax T. Games
361a8eae66 Fixed profile.d support for bash 2016-02-27 12:19:03 -06:00
Dax T. Games
727d6a6abd Added bits about MinGW integration status 2016-02-27 12:05:01 -06:00
Dax T. Games
f7a18d4b6e --amend 2016-02-27 12:00:40 -06:00
Dax T. Games
9e7f860e2d Fixed and added zsh shell capability 2016-02-27 08:43:39 -06:00
Dax T. Games
79f8560a24 added profile.d stuff 2016-02-27 07:40:47 -06:00
Dax T. Games
4245608e6d Merge branch 'development' of https://github.com/cmderdev/cmder into cmder_exinit 2016-02-27 06:41:11 -06:00
Benjamin Staneck
aedd078050 ⬆️ Git@2.7.2.windows.1 2016-02-27 01:39:06 +01:00
Dax T. Games
a959409c0f --amend 2016-02-25 18:22:43 -06:00
Dax T. Games
0a6b79b9ed Added profile.d like support for all supported shells 2016-02-25 08:01:16 -06:00
Dax T. Games
a99d27a7e1 Merge branch 'development' into cmder_exinit 2016-02-19 10:10:12 -06:00
Gregory Pakosz
64d981e470 Fixed get_git_dir() to take submodules into account. Fixes #833 2016-02-16 11:15:42 +01:00
Gregory Pakosz
95bbb8edbb Fixed checkGit() in case of submodules 
Since Git 1.7.8, submodules don't contain a .git/ folder anymore.
Instead, the submodule directory is populated with a .git text file
which contains a git-dir: /path/to/superproject/git_dir/modules/name.

See,
https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.8.txt#L109-L114
 2016-02-10 16:33:01 +01:00
Martin Kemp
95f6096a45 Latest 3rd party updates. 2016-02-08 22:14:04 +00:00
Benjamin Staneck
fccba9269d ⬆️ ConEmu@160202 
Changelog: https://conemu.github.io/en/Whats_New.html
 2016-02-03 03:15:56 +01:00
Benjamin Staneck
07b426355e ⬆️ Git@2.7.0.windows.2 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.0.windows.2
 2016-02-03 03:13:43 +01:00
Jan Schulz
fe45b186e0 clink.lua: add header 
Introduce a header like in the rest of the scripts that this file
is overwritten on updates and should not be modified.
 2016-01-15 18:06:35 +01:00
Jan Schulz
788b5262b4 Reorganize how clink settings are loaded 
4bfdf04d59 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.
 2016-01-15 18:02:10 +01:00
Martin Kemp
5b7c008202 Merge pull request #798 from JanSchulz/cmder_here 
Make "cmder here" work again
 2016-01-15 11:44:39 +00:00
Benjamin Staneck
724b9a25da ⬆️ Bump clink to 0.4.7 2016-01-15 00:16:18 +01:00
Jan Schulz
2c0c6ed416 Make "cmder here" work again 
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.
 2016-01-11 22:19:10 +01:00
Benjamin Staneck
c77641cf03 ⬆️ Git@2.7.0.windows1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.0.windows.1
 2016-01-07 01:50:52 +01:00
Vladimir Kotikov
1389fe0c4d ⬆️ Bump clink to 0.4.6 2015-12-29 00:23:30 +03:00
Dax T. Games
9eb9620966 Fixed som misc stuff and prevented multi runs 2015-12-16 12:37:40 -05:00