fix: path combining

kyaulabs · May 27, 2023 · b3d8b3e · b3d8b3e
1 parent caa3633
commit b3d8b3e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,25 @@ All notable changes to this project will be documented in this file.\
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines
 and [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for versioning adherance.
 
-## [💾](https://github.com/kyaulabs/grimoire/releases/tag/v0.3.0) [0.3.0](https://github.com/kyaulabs/grimoire/compare/v0.1.0...v0.3.0) - (2023-05-23)
+## [💾](https://github.com/kyaulabs/grimoire/releases/tag/v0.3.1) [0.3.1](https://github.com/kyaulabs/grimoire/compare/v0.3.0...v0.3.1) - (2023-05-27)
+
+### 🐛 Bug Fixes
+- Path combining ([5f5cc30](https://github.com/kyaulabs/grimoire/commit/5f5cc3068f7154325ee8c1cabc539920d53a9c7f))
+
+
+### 🔮 Misc
+- Meta files are required for proper importing from git ([caa3633](https://github.com/kyaulabs/grimoire/commit/caa363319d4b5298059d285008700e7013e712de))
+
+<!-- Auto-generated on 2023-05-26T21:46:41.461061700-07:00 -->
+
+## [💾](https://github.com/kyaulabs/grimoire/releases/tag/v0.3.0) [0.3.0](https://github.com/kyaulabs/grimoire/compare/v0.2.0...v0.3.0) - (2023-05-23)
+
+### 🚀 Features
+
+- [Editor] Add/remove default packages ([4b9d24e](https://github.com/kyaulabs/grimoire/commit/4b9d24e32a02909701ff78bbee2671de64fc6cfc))
+<!-- Auto-generated on 2023-05-26T21:46:41.461535200-07:00 -->
+
+## [💾](https://github.com/kyaulabs/grimoire/releases/tag/v0.2.0) [0.2.0](https://github.com/kyaulabs/grimoire/compare/v0.1.0...v0.2.0) - (2023-05-23)
 
 ### ♻️ Refactor
 
@@ -17,8 +35,7 @@ and [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for versioning ad
 ### 🚀 Features
 
 - [Editor] Project window file extensions for one column layout ([9d048fc](https://github.com/kyaulabs/grimoire/commit/9d048fc498271c7e688246b5d1b228eaadf2a820))
-- [Editor] Add/remove default packages ([303be5b](https://github.com/kyaulabs/grimoire/commit/303be5b33ff3ee9951a9ccbdaa78517b9e48913a))
-<!-- Auto-generated on 2023-05-23T11:19:26.465211500-07:00 -->
+<!-- Auto-generated on 2023-05-26T21:46:41.461736500-07:00 -->
 
 ## [💾](https://github.com/kyaulabs/grimoire/releases/tag/v0.1.0) [0.1.0](https://github.com/kyaulabs/grimoire/commit/05b03fc749e4bc3b4f3a19974564be5e3e69a021) - (2023-05-22)
 
@@ -29,4 +46,4 @@ and [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for versioning ad
 ### 🚀 Features
 
 - [Editor] Automated project setup ([05b03fc](https://github.com/kyaulabs/grimoire/commit/05b03fc749e4bc3b4f3a19974564be5e3e69a021))
-<!-- Auto-generated on 2023-05-23T11:19:26.465596300-07:00 -->
+<!-- Auto-generated on 2023-05-26T21:46:41.461856-07:00 -->
diff --git a/Editor/MenuToolsDirectories.cs b/Editor/MenuToolsDirectories.cs
@@ -24,14 +24,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-using System;
-using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
-using UnityEditor.PackageManager;
-using UnityEditor.PackageManager.Requests;
 using UnityEngine;
-using PackageInfo = UnityEditor.PackageManager.PackageInfo;
 
 namespace KYAULabs.Tools
 {
@@ -126,12 +121,12 @@ public static void CreateDefaultDirs()
         {
             projectPath ??= string.Empty;
             CreateDirectories(projectPath, "Prefabs", "Scripts", "Tests", "ThirdParty");
-            CreateDirectories(projectPath + "/Scripts", "Core");
-            CreateDirectories(projectPath + "/Tests", "EditMode", "PlayMode");
-            CreateAssemblyDefinition(projectPath + "/Tests/EditMode", "EditModeTests", "EditMode");
-            CreateAssemblyDefinition(projectPath + "/Tests/PlayMode", "PlayModeTests", "PlayMode");
-            CreateAssemblyDefinition(projectPath + "/Scripts", "Game");
-            CreateAssemblyDefinition(projectPath + "/Scripts/Core", "Core");
+            CreateDirectories(Path.Combine(projectPath, "Scripts"), "Core");
+            CreateDirectories(Path.Combine(projectPath, "Tests"), "EditMode", "PlayMode");
+            CreateAssemblyDefinition(Path.Combine(projectPath, "Tests/EditMode"), "EditModeTests", "EditMode");
+            CreateAssemblyDefinition(Path.Combine(projectPath, "Tests/PlayMode"), "PlayModeTests", "PlayMode");
+            CreateAssemblyDefinition(Path.Combine(projectPath, "Scripts"), "Game");
+            CreateAssemblyDefinition(Path.Combine(projectPath, "Scripts/Core"), "Core");
             AssetDatabase.Refresh();
         }
 
@@ -159,9 +154,9 @@ public static void CreateAdditionalDirs()
         {
             projectPath ??= string.Empty;
             CreateDirectories(projectPath, "Art", "Audio", "Settings", "ThirdParty", "UI");
-            CreateDirectories(projectPath + "/Art", "Animations", "Materials", "Meshes", "Particles", "Textures");
-            CreateDirectories(projectPath + "/Audio", "Music", "Sounds");
-            CreateDirectories(projectPath + "/UI", "Fonts", "Icons");
+            CreateDirectories(Path.Combine(projectPath, "Art"), "Animations", "Materials", "Meshes", "Particles", "Textures");
+            CreateDirectories(Path.Combine(projectPath, "Audio"), "Music", "Sounds");
+            CreateDirectories(Path.Combine(projectPath, "UI"), "Fonts", "Icons");
             AssetDatabase.Refresh();
         }
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "com.kyaulabs.tools",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"displayName": "KYAU Labs Tools",
 	"description": "A collection of UnityEditor scripts.",
 	"unity": "2022.2",