Fix illegal character in file name causing corrupt export directory

agraris · Nov 12, 2021 · 7efbab8 · 7efbab8
1 parent 8c03972
commit 7efbab8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Editor/BuildPipelines/AndroidBuildPipeline.cs b/Editor/BuildPipelines/AndroidBuildPipeline.cs
@@ -72,7 +72,7 @@ static string GetBuildPath(BuildType buildType)
         {
             string defaultFolder = Path.Combine(Directory.GetParent(Application.dataPath).FullName, "Builds");
             // Based on semantic versioning
-            string defaultName = $"{Application.productName} {PlayerSettings.bundleVersion}{(buildType == BuildType.Development ? "-dev" : "")}+{PlayerSettings.Android.bundleVersionCode}";
+            string defaultName = $"{RemoveInvalidChars(Application.productName)} {PlayerSettings.bundleVersion}{(buildType == BuildType.Development ? "-dev" : "")}+{PlayerSettings.Android.bundleVersionCode}";
             string extension = (EditorUserBuildSettings.buildAppBundle ? ".aab" : ".apk");
             return Path.Combine(defaultFolder, defaultName + extension).Replace("\\", "/");
         }
@@ -95,6 +95,16 @@ public void OnPostprocessBuild(BuildReport report)
             PlayerSettings.Android.targetArchitectures |= AndroidArchitecture.ARMv7 | AndroidArchitecture.ARM64;
         }
 
+        static string RemoveInvalidChars(string source)
+        {
+            return string.Concat(source.Split(Path.GetInvalidFileNameChars()));
+        }
+
+        static string ReplaceInvalidChars(string source)
+        {
+            return string.Join("_", source.Split(Path.GetInvalidFileNameChars()));
+        }
+
         #region MENU
         [MenuItem("Agraris/Build/Android - Development", false, 1)]
         public static void DevelopmentAndroidBuild()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.agraris.core",
-    "version": "1.0.0-alpha.4",
+    "version": "1.0.0-alpha.5",
     "displayName": "Agraris Core",
     "description": "Agraris tools core components. Intended for internal use.",
     "unity": "2019.3",