Skip to content

fix for Windows os.root() with slash error #235

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
lefou merged 1 commit into from
Nov 15, 2023
Merged

fix for Windows os.root() with slash error #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion os/src-jvm/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package object os {

def root(root: String, fileSystem: FileSystem = FileSystems.getDefault()): Path = {
val path = Path(fileSystem.getPath(root))
assert(path.root == root, s"$root is not a root path")
assert(path.root == root || path.root == root.replace('/', '\\'), s"$root is not a root path")
path
}

Expand Down
2 changes: 1 addition & 1 deletion os/src-native/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package object os {

def root(root: String, fileSystem: FileSystem = FileSystems.getDefault()): Path = {
val path = Path(fileSystem.getPath(root))
assert(path.root == root, s"$root is not a root path")
assert(path.root == root || path.root == root.replace('/', '\\'), s"$root is not a root path")
path
}

Expand Down
6 changes: 4 additions & 2 deletions os/test/src-jvm/PathTestsCustomFilesystem.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,10 @@ object PathTestsCustomFilesystem extends TestSuite {

val testWindows = Tests {
test("cRootPath") {
val p = os.root("C:\\") / "Users"
assert(p.toString == "C:\\Users")
val p1 = os.root("C:\\") / "Users"
assert(p1.toString == "C:\\Users")
val p2 = os.root("C:/") / "Users"
assert(p2.toString == "C:\\Users")
}
}

Expand Down