mirror of
https://github.com/cmderdev/cmder.git
synced 2024-09-20 12:54:20 +08:00
Merge pull request #2943 from daxgames/new_wt
Update to latest released Windows Terminal to allow launching shells as Administrator.
This commit is contained in:
Dax T Games
GitHub
commit
9120d92318
4
vendor/sources.json
vendored
4
vendor/sources.json
vendored
@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"name": "windows-terminal",
|
||||
"version": "1.17.11461.0",
|
||||
"url": "https://github.com/microsoft/terminal/releases/download/v1.17.11461.0/Microsoft.WindowsTerminal_1.17.11461.0_x64.zip"
|
||||
"version": "1.20.11271.0",
|
||||
"url": "https://github.com/microsoft/terminal/releases/download/v1.20.11271.0/Microsoft.WindowsTerminal_1.20.11271.0_x64.zip"
|
||||
},
|
||||
{
|
||||
"name": "git-for-windows",
|
||||
|
||||
40
vendor/start_git_mintty.cmd
vendored
Normal file
40
vendor/start_git_mintty.cmd
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
@echo off
|
||||
|
||||
if not defined CMDER_ROOT (
|
||||
if defined ConEmuDir (
|
||||
for /f "delims=" %%i in ("%ConEmuDir%\..\..") do (
|
||||
set "CMDER_ROOT=%%~fi"
|
||||
)
|
||||
) else (
|
||||
for /f "delims=" %%i in ("%~dp0\..") do (
|
||||
set "CMDER_ROOT=%%~fi"
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
if exist "%CMDER_ROOT%\vendor\git-for-windows" (
|
||||
set "PATH=%CMDER_ROOT%\vendor\git-for-windows\usr\bin;%PATH%"
|
||||
set "gitCmd=%CMDER_ROOT%\vendor\git-for-windows\usr\bin\mintty.exe"
|
||||
) else if exist "%ProgramFiles%\git" (
|
||||
set "PATH=%ProgramFiles%\git\usr\bin;%PATH%"
|
||||
set "gitCmd=%ProgramFiles%\git\usr\bin\mintty.exe"
|
||||
if not exist "%ProgramFiles%\git\etc\profile.d\cmder_exinit.sh" (
|
||||
echo Run 'mklink "%ProgramFiles%\git\etc\profile.d\cmder_exinit.sh" "%CMDER_ROOT%\vendor\cmder_exinit"' in 'cmd::Cmder as Admin' to use Cmder with external Git Bash
|
||||
echo.
|
||||
echo or
|
||||
echo.
|
||||
echo Run 'echo "" ^> "%ProgramFiles%\git\etc\profile.d\cmder_exinit.sh"' in 'cmd::Cmder as Admin' to disable this message.
|
||||
)
|
||||
) else if exist "%ProgramFiles(x86)%\git" (
|
||||
set "PATH=%ProgramFiles(x86)%\git\usr\bin;%PATH%"
|
||||
set "gitCmd=%ProgramFiles(x86)%\git\usr\bin\mintty.exe"
|
||||
if not exist "%ProgramFiles(x86)%\git\etc\profile.d\cmder_exinit.sh" (
|
||||
echo Run 'mklink "%ProgramFiles^(x86^)%\git\etc\profile.d\cmder_exinit.sh" "%CMDER_ROOT%\vendor\cmder_exinit"' in 'cmd::Cmder as Admin' to use Cmder with external Git Bash
|
||||
echo.
|
||||
echo or
|
||||
echo.
|
||||
echo Run 'echo "" ^> "%ProgramFiles^(x86^)%\git\etc\profile.d\cmder_exinit.sh"' in 'cmd::Cmder as Admin' to disable this message.
|
||||
)
|
||||
)
|
||||
|
||||
"%gitCmd%" /bin/bash -l
|
||||
178
vendor/windows_terminal_default_settings.json
vendored
178
vendor/windows_terminal_default_settings.json
vendored
@ -1,23 +1,14 @@
|
||||
{
|
||||
"$help": "https://aka.ms/terminal-documentation",
|
||||
"$schema": "https://aka.ms/terminal-profiles-schema",
|
||||
"actions":
|
||||
[
|
||||
{
|
||||
"command":
|
||||
"actions": [
|
||||
{
|
||||
"command": {
|
||||
"action": "copy",
|
||||
"singleLine": false
|
||||
},
|
||||
"keys": "ctrl+shift+c"
|
||||
},
|
||||
{
|
||||
"command": "paste"
|
||||
},
|
||||
{
|
||||
"command": "find",
|
||||
"keys": "ctrl+shift+f"
|
||||
},
|
||||
{
|
||||
"command": "unbound",
|
||||
"keys": "ctrl+v"
|
||||
@ -27,8 +18,14 @@
|
||||
"keys": "ctrl+c"
|
||||
},
|
||||
{
|
||||
"command":
|
||||
"command": "paste"
|
||||
},
|
||||
{
|
||||
"command": "find",
|
||||
"keys": "ctrl+shift+f"
|
||||
},
|
||||
{
|
||||
"command": {
|
||||
"action": "splitPane",
|
||||
"split": "auto",
|
||||
"splitMode": "duplicate"
|
||||
@ -39,78 +36,83 @@
|
||||
"copyFormatting": "none",
|
||||
"copyOnSelect": true,
|
||||
"defaultProfile": "{48946353-ebe8-4571-a591-7d609f31327a}",
|
||||
"newTabMenu":
|
||||
[
|
||||
"newTabMenu": [
|
||||
{
|
||||
"type": "remainingProfiles"
|
||||
}
|
||||
],
|
||||
"profiles":
|
||||
"profiles": {
|
||||
"defaults": {
|
||||
"colorScheme": "One Half Dark",
|
||||
"font": {
|
||||
"face": "Cascadia Code"
|
||||
}
|
||||
},
|
||||
"list": [
|
||||
{
|
||||
"defaults": {},
|
||||
"list":
|
||||
[
|
||||
{
|
||||
"colorScheme": "Campbell",
|
||||
"commandline": "cmd /k \"%CMDER_ROOT%\\vendor\\init.bat\"",
|
||||
"colorScheme": "One Half Dark",
|
||||
"commandline": "cmd /k \"%WT_SETTINGS_DIR%\\..\\..\\init.bat\"",
|
||||
"guid": "{48946353-ebe8-4571-a591-7d609f31327a}",
|
||||
"hidden": false,
|
||||
"icon": "%CMDER_ROOT%\\icons\\cmder.ico",
|
||||
"icon": "%WT_SETTINGS_DIR%\\..\\..\\..\\icons\\cmder.ico",
|
||||
"name": "Cmder",
|
||||
"startingDirectory": "",
|
||||
"startingDirectory": null,
|
||||
"tabTitle": "Cmder",
|
||||
"useAtlasEngine": false
|
||||
},
|
||||
{
|
||||
"commandline": "%SystemRoot%\\System32\\cmd.exe /k \"%CMDER_ROOT%\\vendor\\init.bat\"",
|
||||
"colorScheme": "One Half Dark",
|
||||
"commandline": "%SystemRoot%\\System32\\cmd.exe /k \"%WT_SETTINGS_DIR%\\..\\..\\init.bat\"",
|
||||
"elevate": true,
|
||||
"guid": "{bdd957d0-c15a-49e6-9816-14b02351a071}",
|
||||
"hidden": false,
|
||||
"icon": "%CMDER_ROOT%\\icons\\cmder_red.ico",
|
||||
"icon": "%WT_SETTINGS_DIR%\\..\\..\\..\\icons\\cmder_red.ico",
|
||||
"name": "Cmder as Admin",
|
||||
"startingDirectory": "",
|
||||
"startingDirectory": null,
|
||||
"tabTitle": "Cmder as Admin"
|
||||
},
|
||||
{
|
||||
"colorScheme": "Campbell",
|
||||
"commandline": "PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command \"Invoke-Expression 'Import-Module ''%CMDER_ROOT%\\vendor.\\profile.ps1'''\"",
|
||||
"colorScheme": "One Half Dark",
|
||||
"commandline": "PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command \"Invoke-Expression 'Import-Module ''%WT_SETTINGS_DIR%\\..\\..\\profile.ps1'''\"",
|
||||
"guid": "{eb1f6578-ce9d-47a9-a8c7-9b3fdd22302d}",
|
||||
"hidden": false,
|
||||
"icon": "%CMDER_ROOT%\\icons\\cmder_orange.ico",
|
||||
"icon": "%WT_SETTINGS_DIR%\\..\\..\\..\\icons\\cmder_orange.ico",
|
||||
"name": "Cmder - PowerShell",
|
||||
"startingDirectory": "",
|
||||
"startingDirectory": null,
|
||||
"tabTitle": "Cmder",
|
||||
"useAtlasEngine": false
|
||||
},
|
||||
{
|
||||
"colorScheme": "Campbell",
|
||||
"commandline": "PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command \"Invoke-Expression 'Import-Module ''%CMDER_ROOT%\\vendor.\\profile.ps1'''\"",
|
||||
"colorScheme": "One Half Dark",
|
||||
"commandline": "PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command \"Invoke-Expression 'Import-Module ''%WT_SETTINGS_DIR%\\..\\..\\profile.ps1'''\"",
|
||||
"elevate": true,
|
||||
"guid": "{c5225c3e-8619-4145-8182-2800814eeb17}",
|
||||
"hidden": false,
|
||||
"icon": "%CMDER_ROOT%\\icons\\cmder_purple.ico",
|
||||
"icon": "%WT_SETTINGS_DIR%\\..\\..\\..\\icons\\cmder_purple.ico",
|
||||
"name": "Cmder - PowerShell as Admin",
|
||||
"startingDirectory": "",
|
||||
"startingDirectory": null,
|
||||
"tabTitle": "Cmder - PowerShell as Admin",
|
||||
"useAtlasEngine": false
|
||||
},
|
||||
{
|
||||
"commandline": "%CMDER_ROOT%\\vendor\\start_git_bash.cmd",
|
||||
"colorScheme": "One Half Dark",
|
||||
"commandline": "%WT_SETTINGS_DIR%\\..\\..\\start_git_bash.cmd",
|
||||
"guid": "{c5c298e9-010e-4b8c-bc55-e3df81846b4c}",
|
||||
"hidden": false,
|
||||
"icon": "%CMDER_ROOT%\\icons\\cmder_blue.ico",
|
||||
"icon": "%WT_SETTINGS_DIR%\\..\\..\\..\\icons\\cmder_blue.ico",
|
||||
"name": "Cmder - Bash",
|
||||
"startingDirectory": "",
|
||||
"startingDirectory": null,
|
||||
"tabTitle": "Cmder - Bash"
|
||||
},
|
||||
{
|
||||
"commandline": "%CMDER_ROOT%\\vendor\\start_git_bash.cmd",
|
||||
"colorScheme": "One Half Dark",
|
||||
"commandline": "%WT_SETTINGS_DIR%\\..\\..\\start_git_bash.cmd",
|
||||
"elevate": true,
|
||||
"guid": "{545eb9ed-4c1c-49b3-8cc6-7eb41bd280ff}",
|
||||
"hidden": false,
|
||||
"icon": "%CMDER_ROOT%\\icons\\cmder_yellow.ico",
|
||||
"icon": "%WT_SETTINGS_DIR%\\..\\..\\..\\icons\\cmder_yellow.ico",
|
||||
"name": "Cmder - Bash as Admin",
|
||||
"startingDirectory": "",
|
||||
"startingDirectory": null,
|
||||
"tabTitle": "Cmder - Bash as Admin"
|
||||
},
|
||||
{
|
||||
@ -125,11 +127,9 @@
|
||||
"hidden": false,
|
||||
"name": "Command Prompt"
|
||||
}
|
||||
|
||||
]
|
||||
},
|
||||
"schemes":
|
||||
[
|
||||
"schemes": [
|
||||
{
|
||||
"background": "#0C0C0C",
|
||||
"black": "#0C0C0C",
|
||||
@ -176,6 +176,52 @@
|
||||
"white": "#CCCCCC",
|
||||
"yellow": "#C19C00"
|
||||
},
|
||||
{
|
||||
"background": "#282828",
|
||||
"black": "#282828",
|
||||
"blue": "#458588",
|
||||
"brightBlack": "#928374",
|
||||
"brightBlue": "#83A598",
|
||||
"brightCyan": "#8EC07C",
|
||||
"brightGreen": "#B8BB26",
|
||||
"brightPurple": "#D3869B",
|
||||
"brightRed": "#FB4934",
|
||||
"brightWhite": "#EBDBB2",
|
||||
"brightYellow": "#FABD2F",
|
||||
"cursorColor": "#FFFFFF",
|
||||
"cyan": "#689D6A",
|
||||
"foreground": "#EBDBB2",
|
||||
"green": "#98971A",
|
||||
"name": "Gruvbox Dark",
|
||||
"purple": "#B16286",
|
||||
"red": "#CC241D",
|
||||
"selectionBackground": "#FFFFFF",
|
||||
"white": "#A89984",
|
||||
"yellow": "#D79921"
|
||||
},
|
||||
{
|
||||
"background": "#272822",
|
||||
"black": "#3E3D32",
|
||||
"blue": "#03395C",
|
||||
"brightBlack": "#272822",
|
||||
"brightBlue": "#66D9EF",
|
||||
"brightCyan": "#66D9EF",
|
||||
"brightGreen": "#A6E22E",
|
||||
"brightPurple": "#AE81FF",
|
||||
"brightRed": "#F92672",
|
||||
"brightWhite": "#F8F8F2",
|
||||
"brightYellow": "#FD971F",
|
||||
"cursorColor": "#FFFFFF",
|
||||
"cyan": "#66D9EF",
|
||||
"foreground": "#F8F8F2",
|
||||
"green": "#A6E22E",
|
||||
"name": "Monokai",
|
||||
"purple": "#AE81FF",
|
||||
"red": "#F92672",
|
||||
"selectionBackground": "#FFFFFF",
|
||||
"white": "#F8F8F2",
|
||||
"yellow": "#FFE792"
|
||||
},
|
||||
{
|
||||
"background": "#282C34",
|
||||
"black": "#282C34",
|
||||
@ -338,51 +384,7 @@
|
||||
"yellow": "#808000"
|
||||
}
|
||||
],
|
||||
"themes":
|
||||
[
|
||||
{
|
||||
"name": "legacyDark",
|
||||
"tab":
|
||||
{
|
||||
"background": null,
|
||||
"showCloseButton": "always",
|
||||
"unfocusedBackground": null
|
||||
},
|
||||
"window":
|
||||
{
|
||||
"applicationTheme": "dark",
|
||||
"useMica": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "legacyLight",
|
||||
"tab":
|
||||
{
|
||||
"background": null,
|
||||
"showCloseButton": "always",
|
||||
"unfocusedBackground": null
|
||||
},
|
||||
"window":
|
||||
{
|
||||
"applicationTheme": "light",
|
||||
"useMica": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "legacySystem",
|
||||
"tab":
|
||||
{
|
||||
"background": null,
|
||||
"showCloseButton": "always",
|
||||
"unfocusedBackground": null
|
||||
},
|
||||
"window":
|
||||
{
|
||||
"applicationTheme": "system",
|
||||
"useMica": false
|
||||
}
|
||||
}
|
||||
],
|
||||
"themes": [],
|
||||
"useAcrylicInTabRow": true,
|
||||
"wordDelimiters": " ()\"',;<>!@#$%^&*|+=[]{}~?\u2502"
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user