@@ -24,10 +24,13 @@ class GitInstallDetails
24
24
25
25
private readonly bool onWindows ;
26
26
27
- public GitInstallDetails ( NPath targetInstallPath , bool onWindows )
27
+ public GitInstallDetails ( NPath applicationDataPath , bool onWindows )
28
28
{
29
29
this . onWindows = onWindows ;
30
- var gitInstallPath = targetInstallPath . Combine ( ApplicationInfo . ApplicationName , PackageNameWithVersion ) ;
30
+
31
+ PluginDataPath = applicationDataPath . Combine ( ApplicationInfo . ApplicationName ) ;
32
+
33
+ var gitInstallPath = PluginDataPath . Combine ( PackageNameWithVersion ) ;
31
34
GitInstallationPath = gitInstallPath ;
32
35
33
36
if ( onWindows )
@@ -55,6 +58,7 @@ public NPath GetGitLfsExecutablePath(NPath gitInstallRoot)
55
58
: gitInstallRoot . Combine ( "libexec" , "git-core" , GitLfsExecutable ) ;
56
59
}
57
60
61
+ public NPath PluginDataPath { get ; }
58
62
public NPath GitInstallationPath { get ; }
59
63
public string GitExecutable { get ; }
60
64
public NPath GitExecutablePath { get ; }
@@ -177,21 +181,20 @@ private NPath MoveGitAndLfs(NPath gitExtractPath, NPath gitLfsExtractPath, NPath
177
181
178
182
private ITask CreateDownloadTask ( )
179
183
{
180
- var tempZipPath = NPath . CreateTempDirectory ( "git_zip_paths" ) ;
181
- gitArchiveFilePath = tempZipPath . Combine ( "git.zip" ) ;
182
- gitLfsArchivePath = tempZipPath . Combine ( "git-lfs.zip" ) ;
184
+ gitArchiveFilePath = installDetails . PluginDataPath . Combine ( "git.zip" ) ;
185
+ gitLfsArchivePath = installDetails . PluginDataPath . Combine ( "git-lfs.zip" ) ;
183
186
184
187
var downloadGitMd5Task = new DownloadTextTask ( TaskManager . Instance . Token , environment . FileSystem ,
185
- installDetails . GitZipMd5Url , tempZipPath ) ;
188
+ installDetails . GitZipMd5Url , installDetails . PluginDataPath ) ;
186
189
187
190
var downloadGitTask = new DownloadTask ( TaskManager . Instance . Token , environment . FileSystem ,
188
- installDetails . GitZipUrl , tempZipPath ) ;
191
+ installDetails . GitZipUrl , installDetails . PluginDataPath ) ;
189
192
190
193
var downloadGitLfsMd5Task = new DownloadTextTask ( TaskManager . Instance . Token , environment . FileSystem ,
191
- installDetails . GitLfsZipMd5Url , tempZipPath ) ;
194
+ installDetails . GitLfsZipMd5Url , installDetails . PluginDataPath ) ;
192
195
193
196
var downloadGitLfsTask = new DownloadTask ( TaskManager . Instance . Token , environment . FileSystem ,
194
- installDetails . GitLfsZipUrl , tempZipPath ) ;
197
+ installDetails . GitLfsZipUrl , installDetails . PluginDataPath ) ;
195
198
196
199
return
197
200
downloadGitMd5Task . Then ( ( b , s ) => { downloadGitTask . ValidationHash = s ; } )
0 commit comments