Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix can't resolve rebar version problem; fix sdk string mismatching #926

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix can't resolve rebar version problem; fix sdk string mismatching #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/org/intellij/erlang/rebar/settings/RebarConfigurationForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private static void validateRebarPath(String rebarPath, Consumer<String> consume

String escriptPath = RebarRunningStateUtil.findEscriptExecutable();
ExtProcessUtil.ExtProcessOutput escript = ExtProcessUtil.execAndGetFirstLine(3000, escriptPath, rebarPath, "--version");
String versionWithEscript = rebar.getStdOut();
String versionWithEscript = escript.getStdOut();

if (versionWithEscript.startsWith("rebar")) {
updateUI(consumer, versionWithEscript);
Expand Down
2 changes: 1 addition & 1 deletion src/org/intellij/erlang/sdk/ErlangSdkRelease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public final class ErlangSdkRelease {
public static final ErlangSdkRelease V_17_0 = new ErlangSdkRelease("17", "6.0");
public static final ErlangSdkRelease V_18_0 = new ErlangSdkRelease("18", "7.0");

private static final Pattern VERSION_PATTERN = Pattern.compile("Erlang/OTP (\\S+) \\[erts-(\\S+)]");
private static final Pattern VERSION_PATTERN = Pattern.compile("OTP (\\S+), erts-(\\S+)");

private final String myOtpRelease;
private final String myErtsVersion;
Expand Down