diff --git a/CHANGELOG.md b/CHANGELOG.md index 62f72d742..95c9006ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - Ensure fileTypes are mapped to JSON value [#1112](https://github.com/yonaskolb/XcodeGen/pull/1112) @namolnad - Fix platform filter for package dependecies [#1123](https://github.com/yonaskolb/XcodeGen/pull/1123) @raptorxcz - Fix Xcode 13 build [#1130](https://github.com/yonaskolb/XcodeGen/issues/1127) @raptorxcz @mthole +- Fix Monterey MacOS shell version, shell login flag for environments [#1167](https://github.com/yonaskolb/XcodeGen/issues/1167) @bimawa [Commits](https://github.com/yonaskolb/XcodeGen/compare/2.24.0...2.25.0) diff --git a/Sources/XcodeGenKit/PBXProjGenerator.swift b/Sources/XcodeGenKit/PBXProjGenerator.swift index c02f3a34d..990dd9e10 100644 --- a/Sources/XcodeGenKit/PBXProjGenerator.swift +++ b/Sources/XcodeGenKit/PBXProjGenerator.swift @@ -1130,7 +1130,7 @@ public class PBXProjGenerator { name: "Carthage", inputPaths: inputPaths, outputPaths: outputPaths, - shellPath: "/bin/sh", + shellPath: "/bin/sh -l", shellScript: "\(carthageExecutable) copy-frameworks\n" ) ) diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index c0344eb31..e4b47b868 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -2384,7 +2384,7 @@ "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Result.framework", ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; + shellPath = "/bin/sh -l"; shellScript = "carthage copy-frameworks\n"; }; 3D0637F4554EAD6FA48105BF /* MyScript */ = { @@ -2473,7 +2473,7 @@ "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Result.framework", ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; + shellPath = "/bin/sh -l"; shellScript = "carthage copy-frameworks\n"; }; BA454AAC926EDFCDA9226CBC /* MyScript */ = { @@ -2546,7 +2546,7 @@ "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Result.framework", ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; + shellPath = "/bin/sh -l"; shellScript = "carthage copy-frameworks\n"; }; /* End PBXShellScriptBuildPhase section */