Commit Graph

370 Commits

Author SHA1 Message Date
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
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