images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-01-11 00:39:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,019 Commits 9 Branches 38 Tags 6.9 MiB
d592f80364
Commit Graph

436 Commits

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