erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Don't overwrite the wrapper files if the version is the same.

Browse source
This commit is contained in:
Cedric Beust 2016-04-09 08:08:25 -07:00
parent 9351c9f8ce
commit 111343cdeb
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

66
modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
View file

@ -166,7 +166,6 @@ public class Main {
boolean isNew = Float.parseFloat(version) * 1000 >= 650;
String fromZipOutputDir = DISTRIBUTIONS_DIR + File.separator + "kobalt-" + version;
String toZipOutputDir = DISTRIBUTIONS_DIR;
Path kobaltJarFile = Paths.get(toZipOutputDir,
isNew ? "kobalt-" + wrapperVersion : "",
@ -205,8 +204,10 @@ public class Main {
try (BufferedReader bw = new BufferedReader(fw)) {
String installedVersion = bw.readLine();
if (!wrapperVersion.equals(installedVersion)) {
log(2, " Trying to install a different version " + wrapperVersion + " != " + installedVersion
log(2, " Trying to install a different version "
+ wrapperVersion + " != " + installedVersion
+ ", overwriting the installed wrapper");
installWrapperFiles(version, wrapperVersion);
} else {
log(2, " Trying to install the same version " + wrapperVersion + " == " + installedVersion
+ ", not overwriting the installed wrapper");
@ -216,43 +217,42 @@ public class Main {
}
}
//
// Copy the wrapper files in the current kobalt/wrapper directory
//
if (! noOverwrite) {
for (String file : FILES) {
Path to = Paths.get(file);
to.toFile().getAbsoluteFile().getParentFile().mkdirs();
return kobaltJarFile;
}
if (file.endsWith(KOBALTW)) {
generateKobaltW(Paths.get(KOBALTW));
} else {
Path from = Paths.get(fromZipOutputDir, file);
try {
if (isWindows() && to.toFile().exists()) {
log(2, " Windows detected, not overwriting " + to);
} else {
log(2, " Writing " + to);
Files.copy(from, to, StandardCopyOption.REPLACE_EXISTING);
}
} catch (IOException ex) {
log(1, " Couldn't copy " + from + " to " + to + ": " + ex.getMessage());
private void installWrapperFiles(String version, String wrapperVersion) throws IOException {
String fromZipOutputDir = DISTRIBUTIONS_DIR + File.separator + "kobalt-" + version;
for (String file : FILES) {
Path to = Paths.get(file);
to.toFile().getAbsoluteFile().getParentFile().mkdirs();
if (file.endsWith(KOBALTW)) {
generateKobaltW(Paths.get(KOBALTW));
} else {
Path from = Paths.get(fromZipOutputDir, file);
try {
if (isWindows() && to.toFile().exists()) {
log(2, " Windows detected, not overwriting " + to);
} else {
log(2, " Writing " + to);
Files.copy(from, to, StandardCopyOption.REPLACE_EXISTING);
}
}
}
//
// Save wrapper-version.txt
//
log(2, " Writing " + VERSION_TXT);
try (FileWriter fw = new FileWriter(VERSION_TXT)) {
try (BufferedWriter bw = new BufferedWriter(fw)) {
bw.write(wrapperVersion);
} catch (IOException ex) {
log(1, " Couldn't copy " + from + " to " + to + ": " + ex.getMessage());
}
}
}
return kobaltJarFile;
//
// Save wrapper-version.txt
//
log(2, " Writing " + VERSION_TXT);
try (FileWriter fw = new FileWriter(VERSION_TXT)) {
try (BufferedWriter bw = new BufferedWriter(fw)) {
bw.write(wrapperVersion);
}
}
}
private void generateKobaltW(Path filePath) throws IOException {