Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
6800e4a1
Commit
6800e4a1
authored
12 years ago
by
Sergey Simonchik
1
Browse files
Options
Download
Email Patches
Plain Diff
make "setPassFixedPathEnvVarOnMac" optional for ScriptRunnerUtil.execute
parent
859087cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
platform/platform-impl/src/com/intellij/execution/process/ScriptRunnerUtil.java
+12
-3
.../src/com/intellij/execution/process/ScriptRunnerUtil.java
with
12 additions
and
3 deletions
+12
-3
platform/platform-impl/src/com/intellij/execution/process/ScriptRunnerUtil.java
+
12
-
3
View file @
6800e4a1
...
...
@@ -139,11 +139,11 @@ public final class ScriptRunnerUtil {
@Nullable
VirtualFile
scriptFile
,
@NotNull
String
[]
parameters
)
throws
ExecutionException
{
if
(!
SystemInfo
.
isMac
)
{
return
execute
(
exePath
,
workingDirectory
,
scriptFile
,
parameters
);
return
execute
(
exePath
,
workingDirectory
,
scriptFile
,
parameters
,
true
);
}
ExecutionException
firstException
;
try
{
return
execute
(
exePath
,
workingDirectory
,
scriptFile
,
parameters
);
return
execute
(
exePath
,
workingDirectory
,
scriptFile
,
parameters
,
true
);
}
catch
(
ExecutionException
e
)
{
firstException
=
e
;
...
...
@@ -196,10 +196,19 @@ public final class ScriptRunnerUtil {
@Nullable
String
workingDirectory
,
@Nullable
VirtualFile
scriptFile
,
String
[]
parameters
)
throws
ExecutionException
{
return
execute
(
exePath
,
workingDirectory
,
scriptFile
,
parameters
,
false
);
}
@NotNull
private
static
OSProcessHandler
execute
(
@NotNull
String
exePath
,
@Nullable
String
workingDirectory
,
@Nullable
VirtualFile
scriptFile
,
String
[]
parameters
,
boolean
passFixedPathEnvVarOnMac
)
throws
ExecutionException
{
GeneralCommandLine
commandLine
=
new
GeneralCommandLine
();
commandLine
.
setExePath
(
exePath
);
commandLine
.
setPassParentEnvs
(
true
);
commandLine
.
setPassFixedPathEnvVarOnMac
(
true
);
commandLine
.
setPassFixedPathEnvVarOnMac
(
passFixedPathEnvVarOnMac
);
if
(
scriptFile
!=
null
)
{
commandLine
.
addParameter
(
scriptFile
.
getPresentableUrl
());
}
...
...
This diff is collapsed.
Click to expand it.
小 白蛋
@baidan
mentioned in commit
7c0b3f5e
·
2 years ago
mentioned in commit
7c0b3f5e
mentioned in commit 7c0b3f5eae100daa7eed29460b5e27f6cd2810c9
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment