Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9066003b
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9066003b
编写于
9月 09, 2016
作者:
A
Andre Weinand
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix external terminal for linux
上级
d8af9768
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
8 deletion
+24
-8
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
...bench/parts/execution/electron-browser/terminalService.ts
+24
-8
未找到文件。
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
浏览文件 @
9066003b
...
...
@@ -190,13 +190,20 @@ export class LinuxTerminalService implements ITerminalService {
return
new
TPromise
<
void
>
(
(
c
,
e
)
=>
{
const
bashCommand
=
`
${
quote
(
args
)}
; echo; read -p "
${
LinuxTerminalService
.
WAIT_MESSAGE
}
" -n1;`
;
const
termArgs
=
[
'
--title
'
,
`"
${
TERMINAL_TITLE
}
"`
,
'
-x
'
,
'
bash
'
,
'
-c
'
,
`''
${
bashCommand
}
''`
// wrapping argument in two sets of ' because node is so "friendly" that it removes one set...
];
let
termArgs
:
string
[];
if
(
exec
.
indexOf
(
'
gnome-terminal
'
)
>=
0
)
{
const
bashCommand
=
`
${
quote
(
args
)}
; echo; read -p "
${
LinuxTerminalService
.
WAIT_MESSAGE
}
" -n1;`
;
termArgs
=
[
'
--title
'
,
`"
${
TERMINAL_TITLE
}
"`
,
'
-x
'
,
'
bash
'
,
'
-c
'
,
`''
${
bashCommand
}
''`
// wrapping argument in two sets of ' because node is so "friendly" that it removes one set...
];
}
else
{
termArgs
=
[
'
-e
'
,
`''
${
quote
(
args
)}
''`
// wrapping argument in two sets of ' because node is so "friendly" that it removes one set...
];
}
// merge environment variables into a copy of the process.env
const
env
=
extendObject
(
extendObject
(
{
},
process
.
env
),
envVars
);
...
...
@@ -206,13 +213,22 @@ export class LinuxTerminalService implements ITerminalService {
env
:
env
};
let
stderr
=
''
;
const
cmd
=
cp
.
spawn
(
exec
,
termArgs
,
options
);
cmd
.
on
(
'
error
'
,
e
);
cmd
.
stderr
.
on
(
'
data
'
,
(
data
)
=>
{
stderr
+=
data
.
toString
();
});
cmd
.
on
(
'
exit
'
,
(
code
:
number
)
=>
{
if
(
code
===
0
)
{
// OK
c
(
null
);
}
else
{
e
(
nls
.
localize
(
'
linux.term.failed
'
,
"
'{0}' failed with exit code {1}
"
,
exec
,
code
));
if
(
stderr
)
{
const
lines
=
stderr
.
split
(
'
\n
'
,
1
);
e
(
new
Error
(
lines
[
0
]));
}
else
{
e
(
new
Error
(
nls
.
localize
(
'
linux.term.failed
'
,
"
'{0}' failed with exit code {1}
"
,
exec
,
code
)));
}
}
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录