Skip to content

Commit e0ebd69

Browse files
committed
Add default directories to path when locating gtm executable
1 parent 0923783 commit e0ebd69

3 files changed

Lines changed: 26 additions & 5 deletions

File tree

src/io/edgeg/gtm/intellij/GTMConfig.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package io.edgeg.gtm.intellij;
22

3-
import com.intellij.openapi.components.*;
3+
import com.intellij.openapi.components.PersistentStateComponent;
4+
import com.intellij.openapi.components.State;
5+
import com.intellij.openapi.components.Storage;
6+
import com.intellij.openapi.components.StoragePathMacros;
47
import com.intellij.openapi.diagnostic.Logger;
58
import com.intellij.util.xmlb.XmlSerializerUtil;
69
import org.jetbrains.annotations.Nullable;

src/io/edgeg/gtm/intellij/GTMRecord.java

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,29 @@ static void record(String path, Project project) {
8888
}
8989

9090
public static Boolean initGtmExePath() {
91-
String gtmExeName = System.getProperty("os.name").startsWith("Windows") ? "gtm.exe" : "gtm";
92-
String result = null;
91+
String gtmExeName;
92+
String[] gtmPath;
93+
if (System.getProperty("os.name").startsWith("Windows")) {
94+
gtmExeName = "gtm.exe";
95+
gtmPath = new String[]{
96+
Paths.get(System.getenv("ProgramFiles"), "gtm", "bin").toString(),
97+
Paths.get(System.getenv("ProgramFiles(x86)"), "gtm", "bin").toString(),
98+
Paths.get(System.getenv("GOPATH"), "bin").toString()};
99+
} else {
100+
gtmExeName = "gtm";
101+
gtmPath = new String[]{
102+
"/usr/bin","/bin", "/usr/sbin","/sbin","/usr/local/bin/",
103+
Paths.get(System.getenv("GOPATH"), "bin").toString()};
104+
}
105+
93106
String pathVar = System.getenv("PATH");
107+
for (int i = 0; i < gtmPath.length; i++) {
108+
if (!pathVar.contains(gtmPath[i])) {
109+
pathVar += File.pathSeparator + gtmPath[i];
110+
}
111+
}
112+
113+
String result = null;
94114
String[] pathDirs = pathVar.split(File.pathSeparator);
95115
for (String pathDir : pathDirs) {
96116
Path toExe = Paths.get(pathDir, gtmExeName);

src/io/edgeg/gtm/intellij/GitTimeMetric.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.edgeg.gtm.intellij;
22

33
import com.intellij.openapi.components.ApplicationComponent;
4-
import com.intellij.openapi.diagnostic.Logger;
54
import com.intellij.openapi.editor.EditorFactory;
65
import com.intellij.openapi.editor.event.EditorMouseListener;
7-
import com.intellij.openapi.editor.event.VisibleAreaEvent;
86
import com.intellij.openapi.editor.event.VisibleAreaListener;
97
import org.jetbrains.annotations.NotNull;
108

0 commit comments

Comments
 (0)