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

batch files support installation path containing spaces #13577

Merged
merged 2 commits into from
Sep 24, 2021

Conversation

michelou
Copy link
Contributor

@michelou michelou commented Sep 21, 2021

Small follow-up of PR #13006.
Related to issue 12502 (WIP : MSI installer created using WiX).

The changes are Windows-specific and have no impact on the CI build.

In particular, scalac.bat should also work correctly when the Scala 3 installation path contains spaces (e.g. C:\Program Files\Scala 3\).

set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_READER%%_PSEP%"
set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL%%_PSEP%"
set "__TOOLCHAIN=%__TOOLCHAIN%%_JLINE_TERMINAL_JNA%%_PSEP%"
set "__TOOLCHAIN=%__TOOLCHAIN%%_JNA%
Copy link
Contributor

Choose a reason for hiding this comment

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

No closing quote here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch ! Adressed review.

@anatoliykmetyuk anatoliykmetyuk merged commit 2b3f6da into scala:master Sep 24, 2021
@michelou michelou deleted the batch-fix branch September 24, 2021 15:11
@michelou
Copy link
Contributor Author

@anatoliykmetyuk
Backport candidate to release-3.1.0 branch ?!

@anatoliykmetyuk
Copy link
Contributor

@michelou #13634

@michelou
Copy link
Contributor Author

@anatoliykmetyuk Thanks !

@michelou michelou changed the title bach files support installation path containing spaces batch files support installation path containing spaces Nov 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants