Skip to content

Commit

Permalink
Reverted system specific path variables.
Browse files Browse the repository at this point in the history
  • Loading branch information
MattGill98 committed Nov 20, 2018
1 parent bb670bd commit 30e5e65
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void execute(AdminCommandContext context) {
Map<String, String> systemPropsMap = new HashMap<String, String>((Map) (System.getProperties()));
resolver = new TokenResolver(systemPropsMap);
String resolvedInstallDir = resolver.resolve(installdir);
File actualInstallDir = new File(resolvedInstallDir + File.separatorChar + NodeUtils.LANDMARK_FILE);
File actualInstallDir = new File(resolvedInstallDir + "/" + NodeUtils.LANDMARK_FILE);

if (!actualInstallDir.exists()) {
report.setMessage(Strings.get("invalid.installdir", installdir));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,6 @@ private File fileOf(File base, String uri) throws URISyntaxException {
// have to use string concatenation to combine the relative URI
// with the base URI because URI.resolve() ignores the last
// component of the base URI
return new File(new URI(base.toURI().toString() + File.separatorChar + uri));
return new File(new URI(base.toURI().toString() + "/" + uri));
}
}

0 comments on commit 30e5e65

Please sign in to comment.