Skip to content

Commit 0686a27

Browse files
committed
Revert "paper: fall back to VERSION env var when jar missing metadata (#422)"
This reverts commit 1898ff8.
1 parent 1898ff8 commit 0686a27

File tree

1 file changed

+24
-35
lines changed

1 file changed

+24
-35
lines changed

src/main/java/me/itzg/helpers/paper/InstallPaperCommand.java

Lines changed: 24 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.net.URI;
66
import java.nio.file.Path;
77
import java.util.Collections;
8+
import java.util.Optional;
89
import java.util.concurrent.Callable;
910
import java.util.regex.Matcher;
1011
import java.util.regex.Pattern;
@@ -162,45 +163,33 @@ private Result downloadCustom(URI downloadUrl) {
162163
.handleStatus(Fetch.loggingDownloadStatusHandler(log))
163164
.assemble()
164165
.publishOn(Schedulers.boundedElastic())
165-
.flatMap(serverJar -> processDownloadedJar(downloadUrl, serverJar))
166+
.flatMap(serverJar -> {
167+
final String version;
168+
try {
169+
version = Optional.ofNullable(extractVersionFromJar(serverJar))
170+
.orElseGet(() -> {
171+
log.warn("Version metadata {} was missing from server jar: {}", VERSION_METADATA_NAME, serverJar);
172+
return "custom";
173+
});
174+
175+
} catch (IOException e) {
176+
return Mono.error(new GenericException("Failed to extract version from custom server jar", e));
177+
}
178+
return Mono.just(Result.builder()
179+
.serverJar(serverJar)
180+
.newManifest(
181+
PaperManifest.builder()
182+
.customDownloadUrl(downloadUrl)
183+
.files(Collections.singleton(Manifests.relativize(outputDirectory, serverJar)))
184+
.build()
185+
)
186+
.version(version)
187+
.build());
188+
})
166189
.block();
167190
}
168191
}
169192

170-
private Mono<Result> processDownloadedJar(URI downloadUrl, Path serverJar) {
171-
final String version;
172-
try {
173-
final String versionFromJar = extractVersionFromJar(serverJar);
174-
if (versionFromJar != null) {
175-
version = versionFromJar;
176-
}
177-
else {
178-
log.warn("Version metadata {} was missing from server jar: {}", VERSION_METADATA_NAME, serverJar);
179-
final String fromEnv = System.getenv("VERSION");
180-
if (fromEnv != null) {
181-
version = fromEnv;
182-
}
183-
else {
184-
throw new GenericException("Set environment variable 'VERSION' due to missing version metadata");
185-
}
186-
187-
}
188-
} catch (IOException e) {
189-
return Mono.error(new GenericException("Failed to extract version from custom server jar", e));
190-
}
191-
192-
return Mono.just(Result.builder()
193-
.serverJar(serverJar)
194-
.newManifest(
195-
PaperManifest.builder()
196-
.customDownloadUrl(downloadUrl)
197-
.files(Collections.singleton(Manifests.relativize(outputDirectory, serverJar)))
198-
.build()
199-
)
200-
.version(version)
201-
.build());
202-
}
203-
204193
private String extractVersionFromJar(Path serverJar) throws IOException {
205194
final VersionMeta versionMeta = IoStreams.readFileFromZip(serverJar, VERSION_METADATA_NAME, in ->
206195
ObjectMappers.defaultMapper().readValue(in, VersionMeta.class)

0 commit comments

Comments
 (0)