Commit Graph

1523 Commits

Author SHA1 Message Date
dgames
24cad3ed5c fix 'alias ..=cd ..' removing 2 char aliases 2020-12-23 07:30:47 -05:00
dgames
ae7ddb7f86 Merge branch 'master' of https://github.com/cmderdev/cmder 2020-12-23 07:29:36 -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
dgames
eb8e470fe3 Merge branch 'master' of https://github.com/cmderdev/cmder 2020-12-11 05:52:31 -05: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
dgames
0ff3b391f1 Merge branch 'master' of https://github.com/cmderdev/cmder into master 2020-12-11 03:47:19 -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
dgames
4874e78953 remove debug 2020-12-06 10:56:58 -05:00
dgames
f4988480f6 debug 2020-12-06 09:23:23 -05:00
Alex Kostyukov
44f5095047
fix docs for user-aliases.cmd #2397 (#2398) 2020-10-27 17:32:05 +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
6458199812
Merge pull request #2380 from daxgames/fix_git_not_expected
Fix `\Git\cmd\git.exe" found." was unexpected at this time.`
2020-08-31 19:11:19 -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
2cd7632720
Merge pull request #2376 from MMShep97/update-readme-links
Update readme links
2020-08-15 09:02:51 -04:00
mshepherd
92169c1295 Deletes link to non-existent repo :( 2020-08-14 17:57:50 -05:00
mshepherd
e0aba11018 Updates readme link to correct path
Fixes capitalization

Fixes opt to be bin

Updates readme link to correct path
2020-08-14 17:47:24 -05:00
Dax T Games
e8fe522a99
Merge pull request #2372 from cmderdev/revert-2371-revert-2369-fix-powershell-prompt
Revert "Revert "Update profile.ps1""
2020-08-13 12:19:36 -04:00
Dax T Games
937874f03c
Revert "Revert "Update profile.ps1"" 2020-08-13 07:29:24 -04:00
Dax T Games
9e085f5938
Merge pull request #2371 from cmderdev/revert-2369-fix-powershell-prompt
Revert "Update profile.ps1"
2020-08-13 07:09:20 -04:00
Dax T Games
829a65f552
Revert "Update profile.ps1" 2020-08-13 07:08:20 -04:00
Dax T Games
93b69798f4
Merge pull request #2369 from mcnubblet/fix-powershell-prompt
Update profile.ps1
2020-08-13 06:48:01 -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
a1785415fd
Merge pull request #2359 from daxgames/changelog
Changelog
2020-07-29 20:43:32 -04:00
Dax T. Games
794ae2ad60 changelog 2020-07-29 20:42:14 -04:00
Dax T. Games
28c416a15c changelog 2020-07-29 20:41:29 -04:00
Dax T. Games
70aa573111 changelog 2020-07-29 20:39:37 -04: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
Dax T Games
fdcbd6df87
Delete vscode_init_args.cmd 2020-07-23 08:43:09 -04:00
Dax T Games
0c41d5f5d4
Merge pull request #2351 from famoses/patch-1
quote time measures for timer.cmd
2020-07-18 08:58:53 -04:00