Skip to content

Fix/bash path slash #16997

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.

Sign up for GitHub

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

Merged
czoido merged 3 commits into from
Sep 16, 2024
Merged

Fix/bash path slash #16997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c2500e
fix bash_path slashes
memsharded Sep 13, 2024
dfa2969
test
memsharded Sep 13, 2024
b002032
fix test
memsharded Sep 14, 2024
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
1 change: 1 addition & 0 deletions conans/client/subsystems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def _windows_bash_wrapper(conanfile, command, env, envfiles_folder):
if not shell_path:
raise ConanException("The config 'tools.microsoft.bash:path' is "
"needed to run commands in a Windows subsystem")
shell_path = shell_path.replace("\\", "/") # Should work in all terminals
env = env or []
if subsystem == MSYS2:
# Configure MSYS2 to inherith the PATH
Expand Down
2 changes: 1 addition & 1 deletion test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"platform": "Windows",
"default": "system",
"exe": "make",
"system": {"path": {'Windows': "C:/msys64/usr/bin"}},
"system": {"path": {'Windows': r"C:\msys64\usr\bin"}},
},
'msys2_clang64': {
"disabled": True,
Expand Down
2 changes: 1 addition & 1 deletion test/functional/toolchains/gnu/autotools/test_win_bash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class Recipe(ConanFile):

def package_info(self):
self.conf_info.define("tools.microsoft.bash:subsystem", "msys2")
self.conf_info.define("tools.microsoft.bash:path", "{}")
self.conf_info.define("tools.microsoft.bash:path", r"{}")
""".format(bash_path))
client.save({"conanfile.py": conanfile})
client.run("create .")
Expand Down