[fix] Fix folder naming

nimblehq · Sep 28, 2023 · 79afd7e · 79afd7e
1 parent 3449d97
commit 79afd7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Scripts/Swift/SetUpInterface.swift b/Scripts/Swift/SetUpInterface.swift
@@ -5,12 +5,12 @@ struct SetUpInterface {
         case swiftUI, uiKit
 
         init?(_ name: String) {
-            switch name.lowercased() {
-            case "s", "swiftui":
+            if name == "s" || name == "swiftui" {
                 self = .swiftUI
-            case "u", "uikit":
+            } else if name == "u" || name == "uikit" {
                 self = .uiKit
-            default: return nil
+            } else {
+                return nil
             }
         }
 
@@ -40,7 +40,7 @@ struct SetUpInterface {
         let folderName = interface.folderName
 
         fileManager.moveFiles(in: "tuist/Interfaces/\(folderName)/Project", to: "")
-        fileManager.moveFiles(in: "tuist/Interfaces/\(folderName)/Sources", to: "TemplateApp/Sources")
+        fileManager.moveFiles(in: "tuist/Interfaces/\(folderName)/Sources", to: "\(projectName)/Sources")
         fileManager.removeItems(in: "tuist/Interfaces")
     }
 }
diff --git a/Scripts/Swift/SetUpiOSProject.swift b/Scripts/Swift/SetUpiOSProject.swift
@@ -150,7 +150,8 @@ class SetUpIOSProject {
 
         print("Remove script files and git/index")
         fileManager.removeItems(in: "make.sh")
-        fileManager.removeItems(in: ".github/workflows/test_install_script.yml")
+        fileManager.removeItems(in: ".github/workflows/test_uikit_install_script.yml")
+        fileManager.removeItems(in: ".github/workflows/test_swiftui_install_script.yml")
         fileManager.removeItems(in: ".git/index")
         try safeShell("git reset")
     }
@@ -159,8 +160,6 @@ class SetUpIOSProject {
         if !isCI {
             SetUpCICDService().perform()
             SetUpDeliveryConstants().perform()
-            fileManager.removeItems(in: "fastlane/Tests")
-            fileManager.removeItems(in: "set_up_test_testflight.sh")
             fileManager.removeItems(in: "Scripts")
         }
         print("✅  Completed")