MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] uses 'python3' for running Unix restarter script (IDEA-193029)

Browse Source
This commit is contained in:
Roman Shevchenko
2018-07-06 18:17:34 +02:00
parent ddd28d2cfd
commit 3e20b9b5b3
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/util/Restarter.java
+20 -6
View File
@@ -63,8 +63,8 @@ public class Restarter {
else if (CreateDesktopEntryAction.getLauncherScript() == null) {
problem = "cannot find launcher script in " + PathManager.getBinPath();
}
else if (PathEnvironmentVariableUtil.findInPath("python") == null) {
problem = "cannot find 'python' in PATH";
else if (PathEnvironmentVariableUtil.findInPath("python") == null && PathEnvironmentVariableUtil.findInPath("python3") == null) {
problem = "cannot find neither 'python' nor 'python3' in PATH";
}
else {
problem = checkRestarter("restart.py");
@@ -204,11 +204,25 @@ public class Restarter {
int pid = UnixProcessManager.getCurrentProcessId();
if (pid <= 0) throw new IOException("Invalid process ID: " + pid);
File python = PathEnvironmentVariableUtil.findInPath("python");
if (python == null) python = PathEnvironmentVariableUtil.findInPath("python3");
if (python == null) throw new IOException("Cannot find neither 'python' nor 'python3' in PATH");
File script = new File(PathManager.getBinPath(), "restart.py");
List<String> args = new ArrayList<>();
args.add(String.valueOf(pid));
args.add(launcherScript);
Collections.addAll(args, beforeRestart);
runRestarter(new File(PathManager.getBinPath(), "restart.py"), args);
if ("python".equals(python.getName())) {
args.add(String.valueOf(pid));
args.add(launcherScript);
Collections.addAll(args, beforeRestart);
runRestarter(script, args);
}
else {
args.add(script.getPath());
args.add(String.valueOf(pid));
args.add(launcherScript);
Collections.addAll(args, beforeRestart);
runRestarter(python, args);
}
}
private static void runRestarter(File restarterFile, List<String> restarterArgs) throws IOException {