Merge pull request #751 from github-for-unity/fixes/git-lfs-mac

StanleyGoldman · web-flow · commit 408e626e3305 · 2018-05-15T15:12:09.000-04:00
Fix installing lfs on a mac
diff --git a/generate-package.sh b/generate-package.sh
@@ -30,13 +30,13 @@ if [ $# -ge 7 ]; then
 	MSG="$7"
 fi
 
-EXEC="mono"
+EXEC="mono "
 if [ -e "/c/" ]; then
 	EXEC=""
 fi
 
-if [ ! -e "$DIR/build/CommandLine/CommandLine.exe" ]; then
+if [ ! -e "build/CommandLine/CommandLine.exe" ]; then
 	>&2 xbuild /target:CommandLine "$DIR/GitHub.Unity.sln" /verbosity:minimal
 fi
 
-"$EXEC""$DIR/build/CommandLine/CommandLine.exe" --gen-package --version "$3" --path "$4" --url "$URL" --rn "$RN" --msg "$MSG"
+$EXEC build/CommandLine/CommandLine.exe --gen-package --version "$3" --path "$4" --url "$URL" --rn "$RN" --msg "$MSG"
diff --git a/run-test-webserver.sh b/run-test-webserver.sh
@@ -13,4 +13,4 @@ if [ ! -e build/CommandLine/CommandLine.exe ]; then
 	>&2 xbuild /target:CommandLine GitHub.Unity.sln /verbosity:minimal
 fi
 
-"$EXEC"build/CommandLine/CommandLine.exe --web --port $PORT
+$EXEC build/CommandLine/CommandLine.exe --web --port $PORT
diff --git a/src/GitHub.Api/IO/NiceIO.cs b/src/GitHub.Api/IO/NiceIO.cs
@@ -476,9 +476,9 @@ public override int GetHashCode()
                 hash = hash * 23 + _isInitialized.GetHashCode();
                 hash = hash * 23 + _isRelative.GetHashCode();
                 foreach (var element in _elements)
-                    hash = hash * 23 + (IsLinux ? element : element.ToUpperInvariant()).GetHashCode();
+                    hash = hash * 23 + (IsUnix ? element : element.ToUpperInvariant()).GetHashCode();
                 if (_driveLetter != null)
-                    hash = hash * 23 + (IsLinux ? _driveLetter : _driveLetter.ToUpperInvariant()).GetHashCode();
+                    hash = hash * 23 + (IsUnix ? _driveLetter : _driveLetter.ToUpperInvariant()).GetHashCode();
                 return hash;
             }
         }
@@ -1087,14 +1087,14 @@ public static IFileSystem FileSystem
             }
         }
 
-        private static bool? _isLinux;
-        internal static bool IsLinux
+        private static bool? _isUnix;
+        internal static bool IsUnix
         {
             get
             {
-                if (!_isLinux.HasValue)
-                    _isLinux = FileSystem.DirectoryExists("/proc");
-                return _isLinux.Value;
+                if (!_isUnix.HasValue)
+                    _isUnix = Environment.OSVersion.Platform == PlatformID.MacOSX || Environment.OSVersion.Platform == PlatformID.Unix;
+                return _isUnix.Value;
             }
         }
 
@@ -1103,10 +1103,10 @@ private static StringComparison PathStringComparison
         {
             get
             {
-                // this is lazily evaluated because IsLinux uses the FileSystem object and that can be set
+                // this is lazily evaluated because IsUnix uses the FileSystem object and that can be set
                 // after static constructors happen here
                 if (!_pathStringComparison.HasValue)
-                    _pathStringComparison = IsLinux ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
+                    _pathStringComparison = IsUnix ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
                 return _pathStringComparison.Value;
             }
         }
@@ -1165,7 +1165,7 @@ public static NPath Resolve(this NPath path)
         {
             // Add a reference to Mono.Posix with an .rsp file in the Assets folder with the line "-r:Mono.Posix.dll" for this to work
 #if ENABLE_MONO
-			if (!path.IsInitialized || !NPath.IsLinux /* nothing to resolve on windows */ || path.IsRelative || !path.FileExists())
+			if (!path.IsInitialized || !NPath.IsUnix /* nothing to resolve on windows */ || path.IsRelative || !path.FileExists())
 				return path;
 			return new NPath(Mono.Unix.UnixPath.GetCompleteRealPath(path.ToString()));
 #else
diff --git a/src/GitHub.Api/Installer/ZipHelper.cs b/src/GitHub.Api/Installer/ZipHelper.cs
@@ -67,18 +67,28 @@ public bool Extract(string archive, string outFolder, CancellationToken cancella
                     {
                         Directory.CreateDirectory(directoryName);
                     }
-                    //#if !WINDOWS
-                    //                    if (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX)
-                    //                    {
-                    //                        if (zipEntry.ExternalFileAttributes > 0)
-                    //                        {
-                    //                            int fd = Mono.Unix.Native.Syscall.open(fullZipToPath,
-                    //                                                                    Mono.Unix.Native.OpenFlags.O_CREAT | Mono.Unix.Native.OpenFlags.O_TRUNC,
-                    //                                                                    (Mono.Unix.Native.FilePermissions)zipEntry.ExternalFileAttributes);
-                    //                            Mono.Unix.Native.Syscall.close(fd);
-                    //                        }
-                    //                    }
-                    //#endif
+
+                    try
+                    {
+                        if (NPath.IsUnix)
+                        {
+                           if (zipEntry.ExternalFileAttributes == -2115174400)
+                           {
+                               int fd = Mono.Unix.Native.Syscall.open(fullZipToPath,
+                                                                       Mono.Unix.Native.OpenFlags.O_CREAT | Mono.Unix.Native.OpenFlags.O_TRUNC,
+                                                                        Mono.Unix.Native.FilePermissions.S_IRWXU |
+                                                                        Mono.Unix.Native.FilePermissions.S_IRGRP |
+                                                                        Mono.Unix.Native.FilePermissions.S_IXGRP |
+                                                                        Mono.Unix.Native.FilePermissions.S_IROTH |
+                                                                        Mono.Unix.Native.FilePermissions.S_IXOTH);
+                               Mono.Unix.Native.Syscall.close(fd);
+                           }
+                       }
+                   }
+                   catch (Exception ex)
+                   {
+                        LogHelper.Error(ex, "Error setting file attributes in " + fullZipToPath);
+                   }
 
                     // Unzip file in buffered chunks. This is just as fast as unpacking to a buffer the full size
                     // of the file, but does not waste memory.
diff --git a/src/GitHub.Api/Platform/ProcessEnvironment.cs b/src/GitHub.Api/Platform/ProcessEnvironment.cs
@@ -38,6 +38,7 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
             string separator = Environment.IsWindows ? ";" : ":";
 
             NPath libexecPath = NPath.Default;
+            List<string> gitPathEntries = new List<string>();
             if (Environment.GitInstallPath.IsInitialized)
             {
                 var gitPathRoot = Environment.GitExecutablePath.Resolve().Parent.Parent;
@@ -60,16 +61,16 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
 
                 if (Environment.IsWindows)
                 {
-                    pathEntries.AddRange(new[] { gitPathRoot.Combine("cmd").ToString(), gitPathRoot.Combine("usr", "bin") });
+                    gitPathEntries.AddRange(new[] { gitPathRoot.Combine("cmd").ToString(), gitPathRoot.Combine("usr", "bin") });
                 }
                 else
                 {
-                    pathEntries.Add(gitExecutableDir.ToString());
+                    gitPathEntries.Add(gitExecutableDir.ToString());
                 }
 
                 if (libexecPath.IsInitialized)
-                    pathEntries.Add(libexecPath);
-                pathEntries.Add(binPath);
+                    gitPathEntries.Add(libexecPath);
+                gitPathEntries.Add(binPath);
 
                 // we can only set this env var if there is a libexec/git-core. git will bypass internally bundled tools if this env var
                 // is set, which will break Apple's system git on certain tools (like osx-credentialmanager)
@@ -81,6 +82,8 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet
             {
                 pathEntries.Add(Environment.GitLfsInstallPath);
             }
+            if (gitPathEntries.Count > 0)
+                pathEntries.AddRange(gitPathEntries);
 
             pathEntries.Add("END");
 
diff --git a/src/GitHub.Api/PlatformResources/mac/git-lfs.json b/src/GitHub.Api/PlatformResources/mac/git-lfs.json
@@ -1 +1,3 @@
-{"md5":"c78270c2c94a4adce4beeef3010c732e","url":"http://ghfvs-installer.github.com/unity/git/mac/git-lfs.zip","releaseNotes":null,"releaseNotesUrl":null,"message":null,"version":"2.4.0"}
+{"md5":"e2941215f99afa99f002e96c0ae70966","url":"http://ghfvs-installer.github.com/unity/git/mac/git-lfs.zip","releaseNotes":null,"releaseNotesUrl":null,"message":null,"version":"2.4.0"}
+WARNING: The runtime version supported by this application is unavailable.
+Using default runtime: v4.0.30319
diff --git a/src/GitHub.Api/PlatformResources/mac/git-lfs.zip b/src/GitHub.Api/PlatformResources/mac/git-lfs.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8d924dfef97d579305a485f30ad3866f775b295394be199eb487faca4357672
-size 2831355
+oid sha256:4e1ea7c1c6b78c05293039c634426760dfc36cedd6a8a8e92ab26809abcf829a
+size 2936128
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitPathView.cs
@@ -124,6 +124,7 @@ public override void OnGUI()
                         if (EditorGUI.EndChangeCheck())
                         {
                             changingManually = true;
+                            errorMessage = "";
                         }
                     }
                     GUILayout.EndHorizontal();
@@ -156,6 +157,7 @@ public override void OnGUI()
                         resetToBundled = true;
                         resetToSystem = false;
                         changingManually = false;
+                        errorMessage = "";
                     }
 
                     //Find button - for attempting to locate a new install
@@ -189,6 +191,7 @@ public override void OnGUI()
                                 resetToBundled = false;
                                 resetToSystem = true;
                                 changingManually = false;
+                                errorMessage = "";
                                 Redraw();
                             })
                         .Start();
diff --git a/src/tests/IntegrationTests/Installer/GitInstallerTests.cs b/src/tests/IntegrationTests/Installer/GitInstallerTests.cs
@@ -253,8 +253,8 @@ public void GitLfsIsInstalledIfMissingWithCustomGitPath()
             var procTask = new SimpleProcessTask(TaskManager.Token, "something")
                 .Configure(ProcessManager);
             var pathList = procTask.Process.StartInfo.EnvironmentVariables["PATH"].ToNPathList(Environment).TakeWhile(x => x != "END");
-            pathList.First().Should().Be(gitExec.Parent);
-            pathList.Any(x => x == gitLfsExec.Parent).Should().BeTrue();
+            pathList.First().Should().Be(gitLfsExec.Parent);
+            pathList.Skip(1).First().Should().Be(gitExec.Parent);
         }
     }
 }
diff --git a/src/tests/TestWebServer/HttpServer.cs b/src/tests/TestWebServer/HttpServer.cs
@@ -105,7 +105,7 @@ private void Process(HttpListenerContext context)
             var filename = context.Request.Url.AbsolutePath;
             Logger.Info($"{filename}");
             filename = filename.TrimStart('/');
-            filename = filename.Replace('/', '\\');
+            filename = filename.Replace('/', Path.DirectorySeparatorChar);
             filename = Path.Combine(rootDirectory, filename);
 
             if (!File.Exists(filename))
diff --git a/src/tests/TestWebServer/TestWebServer.csproj b/src/tests/TestWebServer/TestWebServer.csproj
@@ -63,7 +63,10 @@
     <None Include="files\unity\git\windows\git.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="files\unity\git\windows\gitconfig">
+    <None Include="files\unity\git\mac\git-lfs.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="files\unity\git\mac\git-lfs.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="files\unity\latest.json">
diff --git a/src/tests/TestWebServer/files/unity/git/mac/git-lfs.json b/src/tests/TestWebServer/files/unity/git/mac/git-lfs.json
@@ -0,0 +1,3 @@
+{"md5":"e2941215f99afa99f002e96c0ae70966","url":"http://localhost:50000/unity/git/mac/git-lfs.zip","releaseNotes":null,"releaseNotesUrl":null,"message":null,"version":"2.4.0"}
+WARNING: The runtime version supported by this application is unavailable.
+Using default runtime: v4.0.30319
diff --git a/src/tests/TestWebServer/files/unity/git/mac/git-lfs.zip b/src/tests/TestWebServer/files/unity/git/mac/git-lfs.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59a817fa5fa9cbd38eff9422eb576f31e3a225d5be387b292dc827faddfe785b
-size 2831355
+oid sha256:4e1ea7c1c6b78c05293039c634426760dfc36cedd6a8a8e92ab26809abcf829a
+size 2936128
diff --git a/test.sh b/test.sh

Original file line number	Diff line number	Diff line change
`@@ -476,9 +476,9 @@ public override int GetHashCode()`
`476`	`476`	`hash = hash * 23 + _isInitialized.GetHashCode();`
`477`	`477`	`hash = hash * 23 + _isRelative.GetHashCode();`
`478`	`478`	`foreach (var element in _elements)`
`479`		`- hash = hash * 23 + (IsLinux ? element : element.ToUpperInvariant()).GetHashCode();`
	`479`	`+ hash = hash * 23 + (IsUnix ? element : element.ToUpperInvariant()).GetHashCode();`
`480`	`480`	`if (_driveLetter != null)`
`481`		`- hash = hash * 23 + (IsLinux ? _driveLetter : _driveLetter.ToUpperInvariant()).GetHashCode();`
	`481`	`+ hash = hash * 23 + (IsUnix ? _driveLetter : _driveLetter.ToUpperInvariant()).GetHashCode();`
`482`	`482`	`return hash;`
`483`	`483`	`}`
`484`	`484`	`}`
`@@ -1087,14 +1087,14 @@ public static IFileSystem FileSystem`
`1087`	`1087`	`}`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`		`- private static bool? _isLinux;`
`1091`		`- internal static bool IsLinux`
	`1090`	`+ private static bool? _isUnix;`
	`1091`	`+ internal static bool IsUnix`
`1092`	`1092`	`{`
`1093`	`1093`	`get`
`1094`	`1094`	`{`
`1095`		`- if (!_isLinux.HasValue)`
`1096`		`- _isLinux = FileSystem.DirectoryExists("/proc");`
`1097`		`- return _isLinux.Value;`
	`1095`	`+ if (!_isUnix.HasValue)`
	`1096`	`+ _isUnix = Environment.OSVersion.Platform == PlatformID.MacOSX \|\| Environment.OSVersion.Platform == PlatformID.Unix;`
	`1097`	`+ return _isUnix.Value;`
`1098`	`1098`	`}`
`1099`	`1099`	`}`
`1100`	`1100`
`@@ -1103,10 +1103,10 @@ private static StringComparison PathStringComparison`
`1103`	`1103`	`{`
`1104`	`1104`	`get`
`1105`	`1105`	`{`
`1106`		`- // this is lazily evaluated because IsLinux uses the FileSystem object and that can be set`
	`1106`	`+ // this is lazily evaluated because IsUnix uses the FileSystem object and that can be set`
`1107`	`1107`	`// after static constructors happen here`
`1108`	`1108`	`if (!_pathStringComparison.HasValue)`
`1109`		`- _pathStringComparison = IsLinux ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;`
	`1109`	`+ _pathStringComparison = IsUnix ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;`
`1110`	`1110`	`return _pathStringComparison.Value;`
`1111`	`1111`	`}`
`1112`	`1112`	`}`
`@@ -1165,7 +1165,7 @@ public static NPath Resolve(this NPath path)`
`1165`	`1165`	`{`
`1166`	`1166`	`// Add a reference to Mono.Posix with an .rsp file in the Assets folder with the line "-r:Mono.Posix.dll" for this to work`
`1167`	`1167`	`#if ENABLE_MONO`
`1168`		`- if (!path.IsInitialized \|\| !NPath.IsLinux /* nothing to resolve on windows */ \|\| path.IsRelative \|\| !path.FileExists())`
	`1168`	`+ if (!path.IsInitialized \|\| !NPath.IsUnix /* nothing to resolve on windows */ \|\| path.IsRelative \|\| !path.FileExists())`
`1169`	`1169`	`return path;`
`1170`	`1170`	`return new NPath(Mono.Unix.UnixPath.GetCompleteRealPath(path.ToString()));`
`1171`	`1171`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet`
`38`	`38`	`string separator = Environment.IsWindows ? ";" : ":";`
`39`	`39`
`40`	`40`	`NPath libexecPath = NPath.Default;`
	`41`	`+ List<string> gitPathEntries = new List<string>();`
`41`	`42`	`if (Environment.GitInstallPath.IsInitialized)`
`42`	`43`	`{`
`43`	`44`	`var gitPathRoot = Environment.GitExecutablePath.Resolve().Parent.Parent;`
`@@ -60,16 +61,16 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet`
`60`	`61`
`61`	`62`	`if (Environment.IsWindows)`
`62`	`63`	`{`
`63`		`- pathEntries.AddRange(new[] { gitPathRoot.Combine("cmd").ToString(), gitPathRoot.Combine("usr", "bin") });`
	`64`	`+ gitPathEntries.AddRange(new[] { gitPathRoot.Combine("cmd").ToString(), gitPathRoot.Combine("usr", "bin") });`
`64`	`65`	`}`
`65`	`66`	`else`
`66`	`67`	`{`
`67`		`- pathEntries.Add(gitExecutableDir.ToString());`
	`68`	`+ gitPathEntries.Add(gitExecutableDir.ToString());`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`if (libexecPath.IsInitialized)`
`71`		`- pathEntries.Add(libexecPath);`
`72`		`- pathEntries.Add(binPath);`
	`72`	`+ gitPathEntries.Add(libexecPath);`
	`73`	`+ gitPathEntries.Add(binPath);`
`73`	`74`
`74`	`75`	`// we can only set this env var if there is a libexec/git-core. git will bypass internally bundled tools if this env var`
`75`	`76`	`// is set, which will break Apple's system git on certain tools (like osx-credentialmanager)`
`@@ -81,6 +82,8 @@ public void Configure(ProcessStartInfo psi, NPath workingDirectory, bool dontSet`
`81`	`82`	`{`
`82`	`83`	`pathEntries.Add(Environment.GitLfsInstallPath);`
`83`	`84`	`}`
	`85`	`+ if (gitPathEntries.Count > 0)`
	`86`	`+ pathEntries.AddRange(gitPathEntries);`
`84`	`87`
`85`	`88`	`pathEntries.Add("END");`
`86`	`89`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ public override void OnGUI()`
`124`	`124`	`if (EditorGUI.EndChangeCheck())`
`125`	`125`	`{`
`126`	`126`	`changingManually = true;`
	`127`	`+ errorMessage = "";`
`127`	`128`	`}`
`128`	`129`	`}`
`129`	`130`	`GUILayout.EndHorizontal();`
`@@ -156,6 +157,7 @@ public override void OnGUI()`
`156`	`157`	`resetToBundled = true;`
`157`	`158`	`resetToSystem = false;`
`158`	`159`	`changingManually = false;`
	`160`	`+ errorMessage = "";`
`159`	`161`	`}`
`160`	`162`
`161`	`163`	`//Find button - for attempting to locate a new install`
`@@ -189,6 +191,7 @@ public override void OnGUI()`
`189`	`191`	`resetToBundled = false;`
`190`	`192`	`resetToSystem = true;`
`191`	`193`	`changingManually = false;`
	`194`	`+ errorMessage = "";`
`192`	`195`	`Redraw();`
`193`	`196`	`})`
`194`	`197`	`.Start();`
Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,8 @@ public void GitLfsIsInstalledIfMissingWithCustomGitPath()`
`253`	`253`	`var procTask = new SimpleProcessTask(TaskManager.Token, "something")`
`254`	`254`	`.Configure(ProcessManager);`
`255`	`255`	`var pathList = procTask.Process.StartInfo.EnvironmentVariables["PATH"].ToNPathList(Environment).TakeWhile(x => x != "END");`
`256`		`- pathList.First().Should().Be(gitExec.Parent);`
`257`		`- pathList.Any(x => x == gitLfsExec.Parent).Should().BeTrue();`
	`256`	`+ pathList.First().Should().Be(gitLfsExec.Parent);`
	`257`	`+ pathList.Skip(1).First().Should().Be(gitExec.Parent);`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`	`}`