Merge branch 'master' into fixes/unlock-context-menu

github-for-unity · Jun 28, 2017 · 1076e8a · 1076e8a
2 parents 36bf23d + 0c83f0a
commit 1076e8a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -107,8 +107,8 @@ public ITask InitializeRepository()
                 .Then(GitClient.LfsInstall())
                 .ThenInUI(SetProjectToTextSerialization)
                 .Then(new ActionTask(CancellationToken, _ => {
-                    AssemblyResources.ToFile(ResourceType.Generic, ".gitignore", targetPath);
-                    AssemblyResources.ToFile(ResourceType.Generic, ".gitattributes", targetPath);
+                    AssemblyResources.ToFile(ResourceType.Generic, ".gitignore", targetPath, Environment);
+                    AssemblyResources.ToFile(ResourceType.Generic, ".gitattributes", targetPath, Environment);
 
                     assetsGitignore.CreateFile();
                 }))

diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -239,6 +239,9 @@
     <Compile Include="$(SolutionDir)\script\src\MetricsService.cs">
       <Link>Metrics\MetricsService.cs</Link>
     </Compile>
+    <Compile Include="$(SolutionDir)\script\src\ApplicationInfo_Local.cs">
+      <Link>Properties\ApplicationInfo_Local.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj">

diff --git a/src/GitHub.Api/Helpers/AssemblyResources.cs b/src/GitHub.Api/Helpers/AssemblyResources.cs
@@ -12,7 +12,7 @@ enum ResourceType
 
     class AssemblyResources
     {
-        public static NPath ToFile(ResourceType resourceType, string resource, NPath destinationPath)
+        public static NPath ToFile(ResourceType resourceType, string resource, NPath destinationPath, IEnvironment environment)
         {
             var os = "";
             if (resourceType == ResourceType.Platform)
@@ -21,15 +21,15 @@ public static NPath ToFile(ResourceType resourceType, string resource, NPath des
                     : DefaultEnvironment.OnLinux ? "linux"
                         : "mac";
             }
-            var type = resourceType == ResourceType.Icon ? "Icons"
+            var type = resourceType == ResourceType.Icon ? "IconsAndLogos"
                 : resourceType == ResourceType.Platform ? "PlatformResources"
                 : "Resources";
             var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(
                                      String.Format("GitHub.Unity.{0}{1}.{2}", type, os != "" ? "." + os : os, resource));
             if (stream != null)
                 return destinationPath.Combine(resource).WriteAllBytes(stream.ToByteArray());
 
-            return new NPath(type).Combine(os, resource);
+            return environment.ExtensionInstallPath.Combine(type, os, resource);
         }
     }
 }
diff --git a/src/GitHub.Api/Installer/GitInstaller.cs b/src/GitHub.Api/Installer/GitInstaller.cs
@@ -163,7 +163,7 @@ public Task<bool> SetupGitIfNeeded(NPath tempPath, IProgress<float> zipFileProgr
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, GitZipFile, tempPath);
+            var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, GitZipFile, tempPath, environment);
             if (!archiveFilePath.FileExists())
             {
                 logger.Warning("Archive \"{0}\" missing", archiveFilePath.ToString());
@@ -228,7 +228,7 @@ public Task<bool> SetupGitLfsIfNeeded(NPath tempPath, IProgress<float> zipFilePr
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, GitLfsZipFile, tempPath);
+            var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, GitLfsZipFile, tempPath, environment);
             if (!archiveFilePath.FileExists())
             {
                 logger.Warning("Archive \"{0}\" missing", archiveFilePath.ToString());

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -50,7 +50,7 @@ public IEnvironment Environment
                     {
                         unityAssetsPath = Application.dataPath;
                         unityApplication = EditorApplication.applicationPath;
-                        extensionInstallPath = AssetDatabase.GetAssetPath(this);
+                        extensionInstallPath = DetermineInstallationPath();
                         unityVersion = Application.unityVersion;
                     }
                     environment.Initialize(unityVersion, extensionInstallPath.ToNPath(), unityApplication.ToNPath(), unityAssetsPath.ToNPath());
@@ -62,6 +62,16 @@ public IEnvironment Environment
             }
         }
 
+        private NPath DetermineInstallationPath()
+        {
+            // Juggling to find out where we got installed
+            var shim = ScriptableObject.CreateInstance<RunLocationShim>();
+            var script = MonoScript.FromScriptableObject(shim);
+            var scriptPath = AssetDatabase.GetAssetPath(script).ToNPath();
+            ScriptableObject.DestroyImmediate(shim);
+            return scriptPath.Parent;
+        }
+
         public void Flush()
         {
             repositoryPath = Environment.RepositoryPath;

diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationWindow.cs
@@ -29,6 +29,10 @@ public static IView Open(Action<bool> onClose = null)
 
         public override void OnGUI()
         {
+            if (authView == null)
+            {
+                CreateViews();
+            }
             authView.OnGUI();
         }