Skip to content

Conversation

cmcgee1024
Copy link
Member

Correct productbuild issue when creating a pkg from synthesized
distribution.xml.

Fix quiet option so that it doesn't prevent the environment file from
being added to the profile.

@cmcgee1024
Copy link
Member Author

@swift-ci test macOS

@cmcgee1024 cmcgee1024 marked this pull request as ready for review March 27, 2025 17:29
}
}

// Ensure swiftly doesn't overwrite any existing executables without getting confirmation first.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check had existed to check only if swiftly was already at the destination, prompting before overwriting it. The init subcommand is there to install swiftly, so it's not technically a problem if it's overwriting the binary in the destination. There is a separate check to see if it will be overwriting a user's configuration, and/or toolchains.

@cmcgee1024
Copy link
Member Author

@swift-ci test macOS

@cmcgee1024
Copy link
Member Author

@swift-ci test macOS

Copy link
Contributor

@justice-adams-apple justice-adams-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, could this change result in a user having two swiftly on path then (if they already had it installed at the previous Library/Application Support location)?

@cmcgee1024
Copy link
Member Author

LGTM, could this change result in a user having two swiftly on path then (if they already had it installed at the previous Library/Application Support location)?

Yes, but we haven't had an official release of swiftly yet with macOS, so it should be manageable. There is always a general risk that the user could have multiple installs of swiftly in different locations, and we might not be able to easily detect that. One of them will ultimately win in the sense that the env vars override the others at the shell.

@cmcgee1024 cmcgee1024 merged commit 9947c62 into swiftlang:release/1.0 Mar 27, 2025
19 checks passed
cmcgee1024 added a commit to cmcgee1024/swiftly that referenced this pull request Mar 27, 2025
Correct productbuild issue when creating a pkg

Set the default swiftly home and binary locations on macOS to ~/.swiftly
cmcgee1024 added a commit that referenced this pull request Mar 27, 2025
Correct productbuild issue when creating a pkg

Set the default swiftly home and binary locations on macOS to ~/.swiftly
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants