Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package_mac.sh: fix fallback to hdiutil #6118

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Conversation

reidpr
Copy link
Contributor

@reidpr reidpr commented Feb 26, 2024

Prior to this PR, if the test for appimg on line 118 failed, the script would immediately exit (because of set -e on line 3), without running the test on line 119. I.e., the script would just stop, producing neither a .dmg nor an error message.

This PR moves the test into a subshell in the if, and now the intended hdiutil fallback works.

@osy
Copy link
Contributor

osy commented Feb 26, 2024

Can you use the square bracket syntax to be consistent with the rest of the script? Then squash and force push? Thanks

@reidpr
Copy link
Contributor Author

reidpr commented Feb 26, 2024

Thanks. I can’t use square brackets because we’re testing the result of a command, rather than a conditional, but I can remove the parentheses entirely.

Squashed and force-pushed.

@osy
Copy link
Contributor

osy commented Feb 26, 2024

Makes sense, thanks

@osy osy added this to the v4.5 milestone Feb 26, 2024
@osy osy merged commit 5753332 into utmapp:main Feb 27, 2024
26 checks passed
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