Skip to content

Rename helper function strip_backslash -> strip_path_separator #152

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
merged 1 commit into from
Jun 10, 2021
Merged

Rename helper function strip_backslash -> strip_path_separator #152

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
8 changes: 4 additions & 4 deletions src/Prefix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Returns the logs directory for the given `prefix`. If `subdir` is a non-empty s
directory it is appended to the logdir of the given `prefix`.
"""
function logdir(prefix::Prefix; subdir::AbstractString="")
return strip_backslash(joinpath(prefix, "logs", subdir))
return strip_path_separator(joinpath(prefix, "logs", subdir))
end

"""
Expand Down Expand Up @@ -262,7 +262,7 @@ function setup(source::SetupSource{GitSource}, targetdir, verbose)
repo_dir = joinpath(targetdir, name)
if verbose
# Need to strip the trailing separator
path = strip_backslash(targetdir)
path = strip_path_separator(targetdir)
@info "Cloning $(basename(source.path)) to $(basename(repo_dir))..."
end
LibGit2.with(LibGit2.clone(source.path, repo_dir)) do repo
Expand Down Expand Up @@ -302,7 +302,7 @@ end
function setup(source::SetupSource{DirectorySource}, targetdir, verbose)
mkpath(targetdir)
# Need to strip the trailing separator also here
srcpath = strip_backslash(source.path)
srcpath = strip_path_separator(source.path)
if verbose
@info "Copying content of $(basename(srcpath)) in $(basename(targetdir))..."
end
Expand Down Expand Up @@ -362,7 +362,7 @@ function setup_workspace(build_path::AbstractString, sources::Vector,
target = joinpath(srcdir, source.target)
# Trailing directory separator matters for `basename`, so let's strip it
# to avoid confusion
target = strip_backslash(target)
target = strip_path_separator(target)
setup(source, target, verbose)
else
setup(source, srcdir, verbose)
Expand Down
4 changes: 2 additions & 2 deletions src/compat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ extract_fields(x) = Dict(String(name) => getfield(x, name) for name in fieldname

# Trailing directory separator matters for `basename`, so let's strip it to
# avoid confusion
strip_backslash(path::AbstractString) = isdirpath(path) ? dirname(path) : path
strip_path_separator(path::AbstractString) = isdirpath(path) ? dirname(path) : path

function valid_dl_path(path, platform)
try
Expand All @@ -15,4 +15,4 @@ function valid_dl_path(path, platform)
catch
return false
end
end
end
18 changes: 9 additions & 9 deletions test/compat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Test
using BinaryBuilderBase: extract_kwargs, extract_fields, strip_backslash, ArchiveSource
using BinaryBuilderBase: extract_kwargs, extract_fields, strip_path_separator, ArchiveSource
using Downloads: RequestError
@testset "Compat functions" begin
foo(; kwargs...) = collect(extract_kwargs(kwargs, (:bar, :qux)))
Expand All @@ -10,15 +10,15 @@ using Downloads: RequestError

@test extract_fields(ArchiveSource("http://example.org", "this is the hash"; unpack_target = "target")) == Dict("url" => "http://example.org", "hash" => "this is the hash", "unpack_target" => "target")

@test strip_backslash("/home/wizard") == "/home/wizard"
@test strip_backslash("/home/wizard/") == "/home/wizard"
@test strip_backslash("/home//wizard///") == "/home//wizard"
@test strip_backslash("wizard.jl") == "wizard.jl"
@test strip_path_separator("/home/wizard") == "/home/wizard"
@test strip_path_separator("/home/wizard/") == "/home/wizard"
@test strip_path_separator("/home//wizard///") == "/home//wizard"
@test strip_path_separator("wizard.jl") == "wizard.jl"
# Test integration with `basename`
@test basename(strip_backslash("/home/wizard")) == "wizard"
@test basename(strip_backslash("/home/wizard/")) == "wizard"
@test basename(strip_backslash("/home//wizard///")) == "wizard"
@test basename(strip_backslash("wizard.jl")) == "wizard.jl"
@test basename(strip_path_separator("/home/wizard")) == "wizard"
@test basename(strip_path_separator("/home/wizard/")) == "wizard"
@test basename(strip_path_separator("/home//wizard///")) == "wizard"
@test basename(strip_path_separator("wizard.jl")) == "wizard.jl"
end

using BinaryBuilderBase: download_verify, list_tarball_files
Expand Down