more on remove installed packages

[teamcity/dotNetPackagesSupport.git] / nuget-server / src / jetbrains / buildServer / nuget / server / toolRegistry / impl / NuGetToolsInstaller.java

diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java
index af6f5787720da1d9311c4d33f1fc9cbf66410571..82172d33b83cdbc20b962446202c795b46e5d32d 100644 (file)
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/impl/NuGetToolsInstaller.java
@@ -37,15 +37,18 @@ public class NuGetToolsInstaller {
   private final NuGetFeedReader myClient;\r
   private final AvailableToolsState myState;\r
   private final ToolPacker myPacker;\r
   private final NuGetFeedReader myClient;\r
   private final AvailableToolsState myState;\r
   private final ToolPacker myPacker;\r

+  private final PluginNaming myNaming;\r

 \r
   public NuGetToolsInstaller(@NotNull final ToolPaths toolPaths,\r
                              @NotNull final NuGetFeedReader client,\r
                              @NotNull final AvailableToolsState state,\r
 \r
   public NuGetToolsInstaller(@NotNull final ToolPaths toolPaths,\r
                              @NotNull final NuGetFeedReader client,\r
                              @NotNull final AvailableToolsState state,\r

-                             @NotNull final ToolPacker packer) {\r
+                             @NotNull final ToolPacker packer,\r
+                             @NotNull final PluginNaming naming) {\r

     myToolPaths = toolPaths;\r
     myClient = client;\r
     myState = state;\r
     myPacker = packer;\r
     myToolPaths = toolPaths;\r
     myClient = client;\r
     myState = state;\r
     myPacker = packer;\r

+    myNaming = naming;\r

   }\r
 \r
   public InstallResult installNuGet(@NotNull final String packageId, @NotNull final InstallLogger logger) {\r
   }\r
 \r
   public InstallResult installNuGet(@NotNull final String packageId, @NotNull final InstallLogger logger) {\r


@@ -80,7 +83,7 @@ public class NuGetToolsInstaller {
     logger.agentToolPubslishStarted(tool, agentTool);\r
 \r
     try {\r
     logger.agentToolPubslishStarted(tool, agentTool);\r
 \r
     try {\r

-      final File dest = new File(myToolPaths.getAgentPluginsPath(), agentTool.getName());\r
+      final File dest = myNaming.getAgetToolFilePath(tool);\r

       if (!agentTool.renameTo(dest)) {\r
         FileUtil.copy(agentTool, dest);\r
         FileUtil.delete(agentTool);\r
       if (!agentTool.renameTo(dest)) {\r
         FileUtil.copy(agentTool, dest);\r
         FileUtil.delete(agentTool);\r


@@ -94,12 +97,16 @@ public class NuGetToolsInstaller {
     }\r
   }\r
 \r
     }\r
   }\r
 \r

+  private String getAgentToolFileName(@NotNull String version) {\r
+    return "nuget-commnadline-" + version;\r
+  }\r
+\r

   private File packAgentPlugin(@NotNull final InstallLogger logger,\r
                                @NotNull final FeedPackage tool,\r
                                @NotNull final File dest) {\r
     logger.agentToolPackStarted(tool, dest);\r
     try {\r
   private File packAgentPlugin(@NotNull final InstallLogger logger,\r
                                @NotNull final FeedPackage tool,\r
                                @NotNull final File dest) {\r
     logger.agentToolPackStarted(tool, dest);\r
     try {\r

-      return myPacker.packTool("nuget-commandline-" + tool.getInfo().getVersion(), dest);\r
+      return myPacker.packTool(getAgentToolFileName(tool.getInfo().getVersion()), dest);\r

     } catch (Exception e) {\r
       logger.agentToolPackFailed(tool, dest, e);\r
       LOG.warn("Failed to pack agent tool " + tool);\r
     } catch (Exception e) {\r
       logger.agentToolPackFailed(tool, dest, e);\r
       LOG.warn("Failed to pack agent tool " + tool);\r