images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-10 17:59:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,440 Commits 9 Branches 38 Tags 6.6 MiB
cc85a32e48
Commit Graph

655 Commits

Author SHA1 Message Date
dgames
9cf3ba222e remove clink defaults 2021-01-09 09:43:37 -05:00
dgames
01d300f779 cleanup 2020-12-24 18:43:23 -05:00
dgames
ba1027f6d5 cleanup 2020-12-24 18:34:27 -05:00
dgames
b5d172cd32 cleanup 2020-12-24 18:33:10 -05:00
dgames
f362ba8dba spacing 2020-12-24 17:55:56 -05:00
dgames
783cf68d10 CLink migration and clenaup 2020-12-24 17:48:00 -05:00
dgames
c4fb7e6034 Merge branch 'master' of https://github.com/cmderdev/cmder into 1.3.17_fixes 2020-12-24 12:15:08 -05:00
dgames
da0af1d96b 1.3.17 Fixes for clink settings and history 2020-12-24 12:14:46 -05:00
dgames
24cad3ed5c fix 'alias ..=cd ..' removing 2 char aliases 2020-12-23 07:30:47 -05:00
Dax T Games
e0b8ebc669
Clink fork fixes (#2441) 
* debug

* remove debug

* Switch to chrisant996 Clink 1.1.8

* Update to Clink 1.1 10

* CHANGELOG.md

Co-authored-by: dgames <dgames@dtg.local>
 2020-12-21 21:30:30 +00:00
Vladimir Kotikov
00b22ea79a
Update clink-completions to 0.3.6 (#2440) 
https://github.com/vladimir-kotikov/clink-completions/releases/tag/0.3.6
 2020-12-17 10:26:59 +00:00
Dax T Games
9088a5e2e6
Merge pull request #2430 from qfp64/faster-init 
Improve init speed
 2020-12-11 05:48:07 -05:00
Dax T Games
25bc575e8a
Merge pull request #2390 from daxgames/sysinfo 
add systeminfo.exe output to cmder_diag.*
 2020-12-11 05:42:22 -05:00
Kyle McInnes
11a78a8d64 Fix errors 2020-12-10 13:35:40 +00:00
Kyle McInnes
2a9a4d2860 Speed up calls to lib_console 2020-12-07 19:41:11 +00:00
Florian Schwalm
2205461943
Update git for windows to 2.29.1 (#2410) 2020-10-27 17:31:19 +00:00
Dax T. Games
467b4d4ad9 hide possible file write conflict 2020-09-13 08:27:10 -04:00
Dax T. Games
ea6e18c834 hide possible file write confilct 2020-09-13 08:02:46 -04:00
Dax T. Games
4378741aad add systeminfo.exe output 2020-09-12 06:10:41 -04:00
Dax T. Games
d1adf16fa8 'fixes' 2020-08-24 20:27:56 -04:00
Dax T. Games
cda883bc39 add setlocal 2020-08-23 08:47:20 -04:00
Dax T. Games
b1ef763922 add setlocal 2020-08-23 08:42:58 -04:00
Dax T Games
937874f03c
Revert "Revert "Update profile.ps1"" 2020-08-13 07:29:24 -04:00
Dax T Games
829a65f552
Revert "Update profile.ps1" 2020-08-13 07:08:20 -04:00
mcnubblet
3f6aa3b348 Update profile.ps1 
Set utf-8 BOM in profile.ps1 to fix incorrect prompt display in PowerShell
 2020-08-13 14:05:49 +10:00
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