rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-25 08:17:11 -07:00
Code Activity

Tweaks to Wrapper

Browse source
This commit is contained in:
Geert Bevin 2023-05-11 22:27:28 -04:00
parent 7075ac48ac
commit c459298bf9
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/rife/bld/wrapper/Wrapper.java
View file

@ -300,9 +300,6 @@ public class Wrapper {
// ensure required properties are available // ensure required properties are available
wrapperProperties_.put(PROPERTY_REPOSITORIES, MAVEN_CENTRAL); wrapperProperties_.put(PROPERTY_REPOSITORIES, MAVEN_CENTRAL);
wrapperProperties_.put(BLD_PROPERTY_VERSION, version); wrapperProperties_.put(BLD_PROPERTY_VERSION, version);
if (wrapperProperties_.getProperty(DOWNLOAD_LOCATION) == null) {
wrapperProperties_.put(BLD_PROPERTY_DOWNLOAD_LOCATION, DOWNLOAD_LOCATION);
}
// retrieve properties from possible locations // retrieve properties from possible locations
var config = libBldDirectory(WRAPPER_PROPERTIES); var config = libBldDirectory(WRAPPER_PROPERTIES);
@ -357,7 +354,7 @@ public class Wrapper {
default_location = DOWNLOAD_LOCATION_SNAPSHOT; default_location = DOWNLOAD_LOCATION_SNAPSHOT;
} }
var location = wrapperProperties_.getProperty(BLD_PROPERTY_DOWNLOAD_LOCATION, default_location); var location = wrapperProperties_.getProperty(BLD_PROPERTY_DOWNLOAD_LOCATION, default_location);
if (location.trim().isBlank()) { if (location == null || location.trim().isBlank()) {
location = default_location; location = default_location;
} }
return replaceVersion(location, version); return replaceVersion(location, version);