Skip to content

Commit b103703

Browse files
author
jantje
committed
#472 removed the check for bash and sh at startup
1 parent 6b7178f commit b103703

File tree

1 file changed

+42
-35
lines changed

1 file changed

+42
-35
lines changed

io.sloeber.core/src/io/sloeber/core/Activator.java

+42-35
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import io.sloeber.core.listeners.ConfigurationChangeListener;
3838
import io.sloeber.core.listeners.IndexerListener;
3939
import io.sloeber.core.managers.Manager;
40-
import io.sloeber.core.tools.ExternalCommandLauncher;
4140

4241
abstract class FamilyJob extends Job {
4342
static final String MY_FAMILY = "myJobFamily"; //$NON-NLS-1$
@@ -102,40 +101,48 @@ public static Activator getDefault() {
102101
}
103102

104103
private static void testKnownIssues() {
105-
if (Platform.getOS().equals(Platform.OS_WIN32)) {
106-
String bashCommand = "where bash"; //$NON-NLS-1$
107-
String shCommand = "where sh"; //$NON-NLS-1$
108-
boolean bashFound = false;
109-
ExternalCommandLauncher bashCommandLauncher = new ExternalCommandLauncher(bashCommand);
110-
try {
111-
bashFound = (bashCommandLauncher.launch(null) == 0);
112-
} catch (IOException e) {
113-
// nothing to do here
114-
}
115-
boolean shFound = false;
116-
ExternalCommandLauncher shCommandLauncher = new ExternalCommandLauncher(shCommand);
117-
try {
118-
shFound = (shCommandLauncher.launch(null) == 0);
119-
} catch (IOException e) {
120-
// nothing to do here
121-
}
122-
String errorString = Const.EMPTY_STRING;
123-
String addString = Const.EMPTY_STRING;
124-
if (bashFound) {
125-
errorString = errorString + addString + "bash"; //$NON-NLS-1$
126-
addString = " and "; //$NON-NLS-1$
127-
}
128-
if (shFound) {
129-
errorString = errorString + addString + "sh"; //$NON-NLS-1$
130-
addString = " and "; //$NON-NLS-1$
131-
}
132-
if (!errorString.isEmpty()) {
133-
errorString = "we have found programs in the path that might conflict with our external builder.\nThe conflicting programs are " //$NON-NLS-1$
134-
+ errorString
135-
+ ".\nThe program might still function but if you get strange build errors you know where to look\nRunning Sloeber.cmd may fix this issue."; //$NON-NLS-1$
136-
Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, errorString));
137-
}
138-
}
104+
// currently no more issues are known
105+
// if (Platform.getOS().equals(Platform.OS_WIN32)) {
106+
// String bashCommand = "where bash"; //$NON-NLS-1$
107+
// String shCommand = "where sh"; //$NON-NLS-1$
108+
// boolean bashFound = false;
109+
// ExternalCommandLauncher bashCommandLauncher = new
110+
// ExternalCommandLauncher(bashCommand);
111+
// try {
112+
// bashFound = (bashCommandLauncher.launch(null) == 0);
113+
// } catch (IOException e) {
114+
// // nothing to do here
115+
// }
116+
// boolean shFound = false;
117+
// ExternalCommandLauncher shCommandLauncher = new
118+
// ExternalCommandLauncher(shCommand);
119+
// try {
120+
// shFound = (shCommandLauncher.launch(null) == 0);
121+
// } catch (IOException e) {
122+
// // nothing to do here
123+
// }
124+
// String errorString = Const.EMPTY_STRING;
125+
// String addString = Const.EMPTY_STRING;
126+
// if (bashFound) {
127+
// errorString = errorString + addString + "bash"; //$NON-NLS-1$
128+
// addString = " and "; //$NON-NLS-1$
129+
// }
130+
// if (shFound) {
131+
// errorString = errorString + addString + "sh"; //$NON-NLS-1$
132+
// addString = " and "; //$NON-NLS-1$
133+
// }
134+
// if (!errorString.isEmpty()) {
135+
// errorString = "we have found programs in the path that might conflict
136+
// with our external builder.\nThe conflicting programs are "
137+
// //$NON-NLS-1$
138+
// + errorString
139+
// + ".\nThe program might still function but if you get strange build
140+
// errors you know where to look\nRunning Sloeber.cmd may fix this
141+
// issue."; //$NON-NLS-1$
142+
// Common.log(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID,
143+
// errorString));
144+
// }
145+
// }
139146
}
140147

141148
private static void registerListeners() {

0 commit comments

Comments
 (0)