Repository: incubator-slider Updated Branches: refs/heads/develop c9f1fedf9 -> 89ddfed77
SLIDER-848 Package --install command should list what application.def should be set to Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/89ddfed7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/89ddfed7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/89ddfed7 Branch: refs/heads/develop Commit: 89ddfed77aad9828768ba41786197d3c3396b113 Parents: c9f1fed Author: Gour Saha <[email protected]> Authored: Wed Apr 8 13:42:05 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Wed Apr 8 13:42:05 2015 -0700 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/89ddfed7/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 7f1e63b..dc1a361 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -1359,11 +1359,11 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe Path pkgPath = sliderFileSystem.buildPackageDirPath(actionPackageArgs.name, actionPackageArgs.version); - sliderFileSystem.getFileSystem().mkdirs(pkgPath); + if (!sliderFileSystem.getFileSystem().exists(pkgPath)) { + sliderFileSystem.getFileSystem().mkdirs(pkgPath); + } Path fileInFs = new Path(pkgPath, srcFile.getName()); - log.info("Installing package {} at {} and overwrite is {}.", srcFile, - fileInFs, actionPackageArgs.replacePkg); if (sliderFileSystem.getFileSystem().exists(fileInFs) && !actionPackageArgs.replacePkg) { throw new BadCommandArgumentsException("Pkg exists at " + @@ -1371,8 +1371,20 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe ". Use --replacepkg to overwrite."); } + log.info("Installing package {} to {} (overwrite set to {})", srcFile, + fileInFs, actionPackageArgs.replacePkg); sliderFileSystem.getFileSystem().copyFromLocalFile(false, actionPackageArgs.replacePkg, srcFile, fileInFs); + + String destPathWithHomeDir = Path + .getPathWithoutSchemeAndAuthority(fileInFs).toString(); + String destHomeDir = Path.getPathWithoutSchemeAndAuthority( + sliderFileSystem.getFileSystem().getHomeDirectory()).toString(); + String destPathWithoutHomeDir = destPathWithHomeDir.replaceFirst( + destHomeDir + File.separatorChar, StringUtils.EMPTY); + println("\nSet " + AgentKeys.APP_DEF + " in your app config JSON to = %s\n", + destPathWithoutHomeDir); + return EXIT_SUCCESS; }
