images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-14 07:29:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,679 Commits 9 Branches 38 Tags 6.7 MiB
219c879582
Commit Graph

730 Commits

Author SHA1 Message Date
Dax T Games
4cacd2fdc8
Merge pull request #2358 from FloSchwalm/update-to-git-2.28 
Update git for windows to 2.28.0
 2020-07-29 20:28:25 -04:00
Dax T Games
80f76ad956
Merge pull request #2357 from FloSchwalm/fix-git-version-comparison 
Fix git version comparison
 2020-07-29 20:27:23 -04:00
Dax T Games
906bb5d357
Merge pull request #2339 from daxgames/fix_global_vars_vscode_err 
1.3.16-pre: 1.3.15 Fixes
 2020-07-29 19:33:12 -04:00
Florian Schwalm
29d784b2b1 Update git for windows to 2.28.0 2020-07-29 22:58:30 +02:00
Florian Schwalm
fc90722faa Prepend %GIT_INSTALL_ROOT%\cmd to path instead of appending it 
The default setting for path enhancing is appending,
so the provided unix tools don't overwrite windows tools we may want to keep.
For Git this is undesired behavior, though, as we just compared git versions
to decide which one we want to use. The git directory thus needs to be prepended
to the path to make sure a call to git uses the version we selected.
 2020-07-29 22:48:01 +02:00
Florian Schwalm
167c49ee6d Rewrite old calls to :verbose_output to working %lib_console% verbose_output 2020-07-29 22:46:35 +02:00
Florian Schwalm
0ed10e5e89 Reorder if-else-clauses in :compare_git_versions so last else block can be reached 
It is hard to spot without the brackets, but the last else block - that resets %test_dir% and
logs in verbose mode that an older user git version will be ignored - can't actually be reached.
The else block is considered to belong to the if clause "if exist "%test_dir:~0,-4%\cmd\git.exe""
that will only ever be executed if ERRORLEVEL is greather than or equal to 0, thus if the test fails,
the following else if clause "else if ERRORLEVEL 0" will always succeed and the last else block will be ignored.
Using the vendored git version may still have worked because %GIT_INSTALL_ROOT% isn't set either way,
but to enable the log message I reordered if-else-clauses and brackets in the way I think the
original author intended them to work.
 2020-07-29 22:39:46 +02:00
Florian Schwalm
cd50db3a7f Use ERRORLEVEL instead of %errorlevel% to compare git versions 
%errorlevel% was always 0, even if the vendored git version was more current than the installed one
Usually exiting a batch script with "exit /b exitCode" as used in :compare_versions
sets %errorlevel% to the specified exit code
However, this may not work if %errorlevel% was set before with "Set errorlevel="
I didn't find the location where this might have happened,
but I saw the consequence of %errorlevel% always being 0
Thus I decided to use ERRORLEVEL instead as this will always work regardless of environment variable

For more information check https://ss64.com/nt/errorlevel.html
 2020-07-29 22:25:49 +02:00
Dax T. Games
37a223b449 fix lib_path 2020-07-25 05:11:34 -04:00
Dax T Games
334838c079
Update init.bat 2020-07-24 08:34:45 -04:00
Dax T. Games
0c3d89925e 'fix 2020-07-23 13:41:10 -04:00
Dax T. Games
020661af95 Merge branch 'fix_global_vars_vscode_err' of https://github.com/daxgames/cmder into fix_global_vars_vscode_err 2020-07-23 13:39:46 -04:00
Dax T. Games
79261d4d27 fix 2020-07-23 13:36:50 -04:00
Dax T Games
7326a3cfc5
Update init.bat 2020-07-23 13:34:13 -04:00
famoses
40c58417b2
quote time measures for timer.cmd 
The startup time duration is calculated wrongly ( at least for me, on Windows 1909, with CmderMini 1.3.15.1010 ). I got something like "Elapsed Time: 80:36:1.00 (290161.00s total)" printed into the cmder consle window. I can be solved by quoting the time measures taken in `init.bat`. 

It seems that `time.cmd` fails in recognizing two arguments. In fact it did split the first time measure into two arguments and ignored the second time measure.
Example: 
from the two time measures
λ echo %CMDER_INIT_START% %CMDER_INIT_END%
12:53:44,34 12:53:54,04
The call to `time.cmd` created following output (i added echo commands to print variables start and end right after they got assigned the arguments)
start: 12:53:44
end:   34
 2020-07-18 13:32:22 +02:00
Dax T. Games
97a41ddd99 fix cmder_configured GTR 1 2020-07-14 22:31:57 -04:00
Dax T. Games
954937cf97 cleanup 2020-07-05 15:22:09 -04:00
Dax T. Games
2c620d1d67 cleanup 2020-07-05 15:13:23 -04:00
Dax T. Games
5e7a7029d1 make vscode_init.cmd smart enough to apply cmder settings if launched from inside or outside cmder 2020-07-04 14:23:16 -04:00
Dax T. Games
f1c1354c00 make vscode_init.cmd smart enough to apply cmder settings if launched from inside or outside cmder 2020-07-04 13:43:18 -04:00
Dax T Games
0f12de345b
Update init.bat 2020-07-02 07:00:25 -04:00
Dax T. Games
c332ab1a34 Fix bug introduced in 1.3.15 2020-07-01 16:24:36 -04:00
Dax T Games
4403edb110
Update init.bat 2020-07-01 08:26:44 -04:00
Dax T. Games
00bc5439fd Merge branch 'fix_git' into fix_global_vars_vscode_err 2020-06-29 07:51:31 -04:00
Dax T. Games
da5f1bc4db fix git detect 2020-06-29 07:49:22 -04:00
Dax T. Games
250ae06e7a fix vscode terminal errors when setting cmder fast_init=1 outside cmder 2020-06-26 22:27:29 -04:00
Dax T Games
c6edbc0068
Merge pull request #2311 from daxgames/fix_path_enh_recurs 
Fix and enhance enhance_path_recursive
 2020-06-26 16:27:42 -04:00
Dax T Games
8781779636
Update init.bat 
If CMDER_CONFIGURED==1 skip to :CMDER_CONFIGURED
 2020-06-09 19:41:08 -04:00
Dax T Games
31c019b7e4
Update init.bat 
Move skip to user config below clink enablement in cmder_configured == 1
 2020-06-08 21:18:23 -04:00
Dax T Games
4d86559841
Update init.bat 
Remove cmder_configured goto
 2020-06-08 21:03:41 -04:00
Dax T. Games
a999d17f71 Allow setting cmder init.bat arg vars globally on windows. 2020-06-07 15:32:15 -04:00
Dax T. Games
04c784cb16 Allow setting cmder init.bat arg vars globally on windows. 2020-06-07 14:49:02 -04:00
Dax T. Games
b91bb84f3d fix cexec.cmd 2020-05-10 10:56:12 -04:00
Dax T. Games
1f5ea5e596 Fix and enhance enhance_path_recursive 2020-04-29 12:03:24 -04:00
wtof
2936abe2a5 Update git for windows to 2.26.2 2020-04-28 11:18:24 +08:00
Dax T. Games
be5ec648c4 Fix Cmder issue #2290 2020-04-06 10:15:00 -04:00
Dax T Games
2517f55f15
Merge branch 'master' into 1.3.15 2020-04-06 08:48:19 -04:00
Dax T. Games
1af12666e4 move git functions to git lib 2020-04-06 08:46:46 -04:00
Dax T. Games
93f8718489 move git functions to git lib 2020-04-06 08:20:26 -04:00
Michael Roy
1071221468
Fix an issue with clink.find_files() return order not always consistent, leading to .init.lua not being run first lua path being broken (#2278) 2020-03-14 13:01:06 +00:00
andyburgess
251968b4c6 Fixes #2247, fixes #2254 2020-02-21 11:52:52 -05:00
Dax T Games
0e37a4c2f9
Merge pull request #2222 from daxgames/1.3.14 
1.3.14
 2020-01-08 21:34:19 -05:00
Dax T. Games
492fc284f2 Fix issue #2214 2020-01-06 22:57:29 -05:00
Johannes Rappen
fe3d2034ef
Bump git-for-windows to v2.24.1.windows.2 2020-01-06 22:45:17 +01:00
Dax T. Games
180e72a6aa revert --no-log to fix windows 7 clink prompt 2020-01-05 13:52:23 -08:00
Dax T. Games
93cf865071 post-install fixes 2020-01-05 16:41:02 -05:00
Vladimir Kotikov
8df688bada
Update clink-completions 
https://github.com/vladimir-kotikov/clink-completions/releases/tag/0.3.5
 2019-12-05 10:53:32 +03:00
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