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

fix(windows): nsis failed to resolve resources with $ in their name, closes #9657 #9659

Merged
merged 7 commits into from
May 8, 2024

Conversation

enkhjile
Copy link

@enkhjile enkhjile commented May 5, 2024

Registering a global escape function that replaces $ with $$ in Handlebars causes the build step to fail when resources contain $ in their names, because NSIS commands like File /a cannot resolve the escaped paths. #9657

I've added a helper that unescapes $$ back to $ and modified the corresponding resource expression in installer.nsi to use this helper.

If there are better solutions, I'd be happy to implement them.

@enkhjile enkhjile requested a review from a team as a code owner May 5, 2024 07:44
@amrbashir
Copy link
Member

Thanks for your contributions. I did a bit of experiments and seems like only the input to File, needs unescaped values so please revert changes to other places, also could you run cargo fmt inside tooling/bundler?

@enkhjile
Copy link
Author

enkhjile commented May 8, 2024

@amrbashir
Thanks for your feedback. I have reverted the changes to the installer.nsi, except for the File sections, and have run cargo fmt.

Copy link
Member

@amrbashir amrbashir left a comment

Choose a reason for hiding this comment

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

Thank you, just a couple of more to go

amrbashir
amrbashir previously approved these changes May 8, 2024
Copy link
Member

@amrbashir amrbashir left a comment

Choose a reason for hiding this comment

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

Thank you

@amrbashir amrbashir changed the title fix(windows): nsis failed to resolve resources with $ in their name. closes #9657 fix(windows): nsis failed to resolve resources with $ in their name, closes #9657 May 8, 2024
@amrbashir amrbashir merged commit ab9ec42 into tauri-apps:1.x May 8, 2024
10 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.

None yet

2 participants