Skip to content

Commit 4526368

Browse files
committed
[GR-48444] Fix getting the executable path for mu
PullRequest: graal/15465
2 parents 06fa1e3 + bd971ff commit 4526368

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/Main.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ static Arguments parseArguments(String... args) {
106106

107107
if (repoUrl == null) {
108108
repoUrl = OptionProperties.getDefaultRepo();
109-
} else if (!repoUrl.endsWith("/")) {
109+
}
110+
if (!repoUrl.endsWith("/")) {
110111
repoUrl = repoUrl + "/";
111112
}
112113
if (outputDir == null) {

vm/src/org.graalvm.maven.downloader/src/org/graalvm/maven/downloader/OptionProperties.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,8 @@ public static String getExeName() {
7575
public static String getDefaultOutputDir() {
7676
if (RELATIVE_OUTPUT_DIR != null) {
7777
if (ImageInfo.inImageRuntimeCode()) {
78-
if (ProcessProperties.getArgumentVectorBlockSize() > 0) {
79-
String progName = ProcessProperties.getArgumentVectorProgramName();
80-
return Paths.get(progName).resolve("..").resolve(RELATIVE_OUTPUT_DIR).normalize().toString();
81-
}
78+
String progName = ProcessProperties.getExecutableName();
79+
return Paths.get(progName).resolve("..").resolve(RELATIVE_OUTPUT_DIR).normalize().toString();
8280
}
8381
}
8482
return "maven downloader output";

0 commit comments

Comments
 (0)