Merge branch 'develop'

Author: Artem Novichkov

Sources/CartingCore/Carting.swift

@@ -49,11 +49,23 @@ public final class Carting {
                                                                type: .output)
 
             if let carthage = carthageScript {
-                carthage.body.inputPaths = inputPathsString
-                carthage.body.outputPaths = outputPathsString
-                carthage.body.shellScript = Keys.carthageScript
-                print("✅ Script \"\(carthageScriptName)\" in target \"\(target.name)\" was successfully updated.")
-                projectHasBeenUpdated = true
+                var scriptHasBeenUpdated = false
+                if carthage.body.inputPaths != inputPathsString {
+                   carthage.body.inputPaths = inputPathsString
+                    scriptHasBeenUpdated = true
+                }
+                if carthage.body.outputPaths != outputPathsString {
+                    carthage.body.outputPaths = outputPathsString
+                    scriptHasBeenUpdated = true
+                }
+                if carthage.body.shellScript != Keys.carthageScript {
+                    carthage.body.shellScript = Keys.carthageScript
+                    scriptHasBeenUpdated = true
+                }
+                if scriptHasBeenUpdated {
+                    projectHasBeenUpdated = true
+                    print("✅ Script \"\(carthageScriptName)\" in target \"\(target.name)\" was successfully updated.")
+                }
             }
             else if linkedCarthageFrameworkNames.count > 0 {
                 let body = ScriptBody(inputPaths: inputPathsString,

Sources/CartingCore/Models/ScriptBody.swift

@@ -30,10 +30,13 @@ final class ScriptBody: BaseScriptBody {
         components.append(.tripleTab + "outputPaths = \(outputPaths);")
         components.append(.tripleTab + "runOnlyForDeploymentPostprocessing = \(runOnlyForDeploymentPostprocessing);")
         components.append(.tripleTab + "shellPath = \(shellPath);")
-        components.append(.tripleTab + "shellScript = \(shellScript);")
         if let showEnvVarsInLog = showEnvVarsInLog {
+            components.append(.tripleTab + "shellScript = \(shellScript);")
             components.append(.tripleTab + "showEnvVarsInLog = \(showEnvVarsInLog);\n")
         }
+        else {
+            components.append(.tripleTab + "shellScript = \(shellScript);\n")
+        }
         return components.joined(separator: "\n")
     }