Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 1c356ef

Browse files
committed
Fixing a ton of stuff
1 parent 54d78cb commit 1c356ef

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

src/GitHub.Api/Installer/GitInstaller.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ITask<NPath> SetupGitIfNeeded()
2929
{
3030
//Logger.Trace("SetupGitIfNeeded");
3131

32-
installationTask = new FuncTask<GitInstallationState, NPath>(cancellationToken, (_, r) => installDetails.GitExecutablePath)
32+
installationTask = new FuncTask<NPath>(cancellationToken, (_) => installDetails.GitExecutablePath)
3333
{ Name = "Git Installation - Complete" };
3434
installationTask.OnStart += thisTask => thisTask.UpdateProgress(0, 100);
3535
installationTask.OnEnd += (thisTask, result, success, exception) => thisTask.UpdateProgress(100, 100);

src/GitHub.Api/Installer/UnzipTask.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,22 @@ protected virtual NPath RunUnzip(bool success)
7171
UpdateProgress(value, total);
7272
return !Token.IsCancellationRequested;
7373
});
74-
74+
/*
7575
if (expectedMD5 != null)
7676
{
7777
var calculatedMD5 = fileSystem.CalculateFolderMD5(extractedPath);
7878
success = calculatedMD5.Equals(expectedMD5, StringComparison.InvariantCultureIgnoreCase);
79+
*/
7980
if (!success)
8081
{
8182
extractedPath.DeleteIfExists();
8283

83-
var message = $"Extracted MD5: {calculatedMD5} Does not match expected: {expectedMD5}";
84-
Logger.Error(message);
84+
//var message = $"Extracted MD5: {calculatedMD5} Does not match expected: {expectedMD5}";
85+
var message = $"Failed to extract {archiveFilePath} to {extractedPath}";
8586

8687
exception = new UnzipException(message);
8788
}
88-
}
89+
// }
8990
}
9091
catch (Exception ex)
9192
{

src/GitHub.Api/OutputProcessors/ProcessManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void RunCommandLineWindow(NPath workingDirectory)
8484
var envVars = startInfo.EnvironmentVariables;
8585
var scriptContents = new[] {
8686
$"cd {envVars["GHU_WORKINGDIR"]}",
87-
$"PATH={envVars["GHU_FULLPATH"]}:$PATH /bin/bash"
87+
$"PATH=\"{envVars["GHU_FULLPATH"]}\":$PATH /bin/bash"
8888
};
8989
environment.FileSystem.WriteAllLines(envVarFile, scriptContents);
9090
Mono.Unix.Native.Syscall.chmod(envVarFile, (Mono.Unix.Native.FilePermissions)493); // -rwxr-xr-x mode (0755)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ private void MaybeUpdateData()
166166
{
167167
if (metricsHasChanged)
168168
{
169-
metricsEnabled = Manager.UsageTracker.Enabled;
169+
//metricsEnabled = Manager.UsageTracker.Enabled;
170170
metricsHasChanged = false;
171171
}
172172

0 commit comments

Comments
 (0)