Commit Graph

803 Commits

Author SHA1 Message Date
ed92f64f40 Merge remote-tracking branch 'origin/fix_launcher_overwrite' into vagrant+packer 2024-06-03 08:22:30 -04:00
e457afa8d1 Merge branch 'master' into development 2024-05-31 15:06:45 +00:00
e850f8241d add vendor/start_git_mintty.cmd 2024-05-30 16:37:37 -04:00
db3889d5e5 remove vendor/start_git_mintty.cmd 2024-05-30 16:27:43 -04:00
881938ed18 Update Windows Terminal default settings and version 2024-05-30 16:23:51 -04:00
c83c410d39 Merge branch 'development-dax' into vagrant+packer 2024-05-30 10:17:24 -04:00
2b05b3a7aa Update Windows Terminal default settings 2024-05-30 09:13:16 -04:00
45fd0c2666 ⬆️ Update dependencies (git-for-windows v2.45.1.windows.1, clink v1.6.14, clink-completions v0.5.2) 2024-05-29 13:40:37 +00:00
41ac7612bc Update Windows Terminal 2024-05-28 17:35:47 -04:00
546d921e58 Merge branch 'master' into development 2024-05-28 13:49:59 +00:00
5145a15139 display git improper version string as debug 2024-05-28 17:19:47 +03:30
92c662de2f Merge branch 'master' into development 2024-05-23 18:29:27 +00:00
92419a48fc log the executable path for improper git 2024-05-23 21:59:16 +03:30
9ce82383e2 Update Windows Terminal to 1.20.11271.0 2024-05-22 15:00:36 -04:00
5d8037176d Merge remote-tracking branch 'upstream/development' into development-dax
* upstream/development:
  enable `match.expand_envvars`
  fix: fix some typos in comments
  Bump softprops/action-gh-release from 1 to 2
  Bump microsoft/setup-msbuild from 1 to 2 (#2917)
  Bump peter-evans/create-pull-request from 5 to 6 (#2918)
  Bump actions/upload-artifact from 3 to 4 (#2905)
  Do CI on development PRs
  Bump github/codeql-action from 2 to 3 (#2906)
2024-05-22 14:57:04 -04:00
aac7cfc47a Fix GitHub action (merge master into development) 2024-05-21 11:58:26 +03:30
c9b77f618a enable match.expand_envvars
This is part of the "Enhanced default settings" by Clink and a very useful feature
2024-05-20 10:57:51 +03:30
1ed3a36812 Update windows_terminal_default_settings.json 2024-01-02 11:41:21 -05:00
c5579d2cab Add Monokai, Default to One Half Dark 2024-01-02 11:20:20 -05:00
28e9018ce0 make mintty /a work 2023-11-27 10:00:28 -05:00
f8aa7feb1f PR - Requested Changes 2023-11-23 07:10:59 -05:00
8025b5baa2 Merge branch 'development' into windows_terminal 2023-11-21 03:43:31 +03:30
9a4041941e Merge pull request #2896 from daxgames/more_speed_2
Applying the more speed branch to the development
2023-11-21 03:41:20 +03:30
86091b74e9 properly set CMDER_ROOT for windows terminal bash 2023-11-11 17:29:28 -08:00
2135fce19f revert git update to not include a release candidate 2023-11-11 09:12:30 -08:00
01c41a9268 Merge branch 'master' into more_speed_2 2023-11-10 18:21:11 -08:00
678b482269 Merge branch 'master' into windows_terminal 2023-11-10 17:02:47 -08:00
8498447878 ⬆️ Update dependencies (git-for-windows v2.43.0-rc0.windows.1, clink v1.5.12) 2023-11-03 13:40:42 +00:00
ffb93b1804 call init.bat with the same arguments 2023-10-25 12:32:31 +03:30
d0cb6b5c23 ⬆️ Update dependencies (clink v1.5.9, clink-completions v0.4.11) 2023-10-10 13:40:41 +00:00
ddad83c70f PR Review requested changes 2023-09-26 11:17:16 -04:00
01da2fe638 turn off /t in windows terminal defaults 2023-09-25 16:30:41 -04:00
ab10e83d95 sync and add windows terminal to sources. 2023-09-25 14:47:20 -04:00
cb543528af Merge branch 'master' of https://github.com/cmderdev/cmder into windows_terminal 2023-09-25 14:41:09 -04:00
7d3e691a69 add start_git_bash.cmd 2023-09-25 14:04:12 -04:00
d75ba7bce2 Merge branch 'master' of https://github.com/cmderdev/cmder into windows_terminal 2023-09-25 11:15:06 -04:00
968beb8a27 Add initial Windows Terminal support 2023-09-25 11:14:54 -04:00
7c04ee9f6a fixes 2023-09-22 17:15:23 -04:00
94ea2da567 make it work with windows terminal 2023-09-22 17:07:56 -04:00
faf66542b4 ⬆️ Update dependencies (git-for-windows v2.42.0.windows.2, clink v1.5.6) 2023-09-22 13:40:52 +00:00
6b330b81f2 allow launching windows terminal w/cmder from cmder 2023-08-11 10:44:33 -04:00
1ad836b288 Merge remote-tracking branch 'upstream/master' into vagrant+packer 2023-08-11 09:31:13 -04:00
9b446b31d5 Merge remote-tracking branch 'upstream/master' into more_speed_2 2023-07-28 09:53:34 -04:00
3ea9728ffd Merge pull request #2861 from chrisant996/chrisant_fix_2859
Fix #2859; script error when cwd name contains `%`
2023-07-25 17:18:22 +03:30
b47cf43d4c Merge pull request #14 from cmderdev/master
Sync with master
2023-07-24 20:45:28 -04:00
9be28807cb ⬆️ Update dependencies (conemu-maximus5 v23.07.24) (#2863)
Co-authored-by: DRSDavidSoft <DRSDavidSoft@users.noreply.github.com>
2023-07-24 14:55:59 +01:00
e2168a361c ⬆️ Update dependencies (git-for-windows v2.41.0.windows.3, clink v1.5.1, conemu-maximus5 v23.07.23, clink-completions v0.4.10) (#2850)
Co-authored-by: DRSDavidSoft <DRSDavidSoft@users.noreply.github.com>
2023-07-24 09:29:50 +01:00
84ee96c64f Fix #2859; script error when cwd name contains %
The `string.gsub()` function in Lua always uses Lua patterns (which are
similar to regular expressions).  Cmder's custom prompt wants to perform
simple plain text find/replace operations on strings.  `string.gsub()`
is the right Lua function for that, but since it always uses Lua
patterns it's necessary to apply escaping to the input strings otherwise
they can get misinterpreted and cause runtime errors.

For example, if the current working directory name contains a percent
sign, such as literally "My%20Home".

This change fixes that.  It introduces a helper function `gsub_plain()`
which behaves like `string.gsub()` but applies appropriate escaping to
convert the plain text input strings into the corresponding Lua
patterns so that it can achieve plain text find/replace operations.

It also introduces separate helper functions for escaping the `find` and
`replace` parameters for `string.gsub()`, since they have different
escaping rules.
2023-07-10 18:07:53 -07:00
4129084494 add comment to clink.lua explaining /c [folderpath] 2023-07-08 13:09:10 -07:00
320f928830 Merge remote-tracking branch 'upstream/master' into vagrant+packer 2023-07-04 13:46:04 -04:00