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 newlines on Windows conclusion_text #550

Merged
merged 4 commits into from
Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions constructor/winexe.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,12 @@ def make_nsi(info, dir_path, extra_files=()):
replace['CONCLUSION_TITLE'] = conclusion_lines[0].strip()
# See https://nsis.sourceforge.io/Docs/Modern%20UI/Readme.html#toggle_pgf
# for the newlines business
replace['CONCLUSION_TEXT'] = "\\r\\n".join(conclusion_lines[1:])
replace['CONCLUSION_TEXT'] = "\r\n".join(conclusion_lines[1:])

for key, value in replace.items():
if value.startswith('@'):
value = join(dir_path, value[1:])
newlines = key not in ("CONCLUSION_TEXT",)
replace[key] = str_esc(value, newlines=newlines)
replace[key] = str_esc(value)

data = read_nsi_tmpl(info)
ppd = ns_platform(info['_platform'])
Expand Down
3 changes: 2 additions & 1 deletion examples/noconda/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ specs:
- python
conclusion_text: |
Thanks for installing NoConda!

You are now ready to run your Python installation.
This is a second line and should appear as such on the installer UI.
This would be the third one.
25 changes: 25 additions & 0 deletions news/550-conclusion-text
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Enhancements:
-------------

* Enable `conclusion_text` on Windows `.exe` and Unix `.sh` installers (#443 via #547 and #550).

Bug fixes:
----------

* <news item>

Deprecations:
-------------

* <news item>

Docs:
-----

* <news item>

Other:
------

* <news item>