Commit Graph

1433 Commits

Author SHA1 Message Date
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
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
52f5ad62c3 changelog 2020-06-26 22:29:26 -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
bc7984769c
Merge pull request #2338 from daxgames/master
CHANGELOG.md
2020-06-26 16:49:35 -04:00
Dax T. Games
130dc750be CHANGELOG.md 2020-06-26 16:45:21 -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
c0eeec6608
Merge pull request #2335 from kvittokonito/custom_window_icons
Added support for setting custom icons for Cmder window
2020-06-26 16:25:34 -04:00
Gaizka P
ee25dbaab6 Removed leftover debug text in error message box. 2020-06-24 07:25:30 +02:00
Gaizka P
e3ad9c3953 Merge branch 'custom_window_titles'
# Conflicts:
#	launcher/src/CmderLauncher.cpp
2020-06-24 07:23:28 +02:00
Gaizka P
31df5c3e5e Added support for setting custom titles for Cmder window. 2020-06-24 07:17:48 +02:00
Gaizka P
e9f20aea91 Added build configurations for x64. 2020-06-24 03:01:54 +02:00
Gaizka P
29aa75e158 Added support for setting custom icons for Cmder window. 2020-06-24 03:01:22 +02: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
a5dcf9c260
Merge pull request #2323 from SVijayB/Broken-links
Update README.md
2020-06-07 15:52:46 -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
Vijay
a2ce74f981
Update README.md 2020-05-25 00:27:53 +05:30
Dax T. Games
b91bb84f3d fix cexec.cmd 2020-05-10 10:56:12 -04:00
Dax T Games
35ace106c8
Merge pull request #2308 from wtof1996/update-git
Update git for windows to 2.26.2
2020-04-29 13:42:43 -04:00
Dax T. Games
1861983469 readme 2020-04-29 13:40:39 -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
c9bc1f6b83
Merge pull request #2294 from daxgames/1.3.15
Fix Cmder issue #2290
2020-04-06 10:18:26 -04:00
Dax T. Games
be5ec648c4 Fix Cmder issue #2290 2020-04-06 10:15:00 -04:00
Dax T Games
ab3639540f
Merge pull request #2293 from daxgames/1.3.15
1.3.15-pre
2020-04-06 08:50:15 -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