Skip to content

[Prefix] Add subdir argument to logdir function #146

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
May 16, 2021
Merged

[Prefix] Add subdir argument to logdir function #146

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 Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "BinaryBuilderBase"
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
authors = ["Elliot Saba <staticfloat@gmail.com>"]
version = "0.6.4"
version = "0.6.5"

[deps]
CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
Expand Down
9 changes: 5 additions & 4 deletions src/Prefix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,13 @@ function includedir(prefix::Prefix)
end

"""
logdir(prefix::Prefix)
logdir(prefix::Prefix; subdir::AbstractString="")

Returns the logs directory for the given `prefix`.
Returns the logs directory for the given `prefix`. If `subdir` is a non-empty string, that
directory it is appended to the logdir of the given `prefix`.
"""
function logdir(prefix::Prefix)
return joinpath(prefix, "logs")
function logdir(prefix::Prefix; subdir::AbstractString="")
return strip_backslash(joinpath(prefix, "logs", subdir))
Copy link
Member

@staticfloat staticfloat May 16, 2021

Choose a reason for hiding this comment

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

Hilariously, strip_backslash() actually strips forward-slashes on Linux/macOS.

Copy link
Member Author

@giordano giordano May 16, 2021

Choose a reason for hiding this comment

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

I think it's a misnomer 🤦

end

"""
Expand Down
2 changes: 1 addition & 1 deletion src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The functions in this file may not be used anywhere in this package but may
# needed by different modules of BinaryBuilder.jl

with_logfile(f::Function, prefix::Prefix, name::String) = with_logfile(f, joinpath(logdir(prefix), name))
with_logfile(f::Function, prefix::Prefix, name::String; subdir="") = with_logfile(f, joinpath(logdir(prefix; subdir), name))
function with_logfile(f::Function, logfile::String)
mkpath(dirname(logfile))

Expand Down
1 change: 1 addition & 0 deletions test/prefix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ using CodecZlib
@test bindir(prefix) == joinpath(prefix, "bin")
@test includedir(prefix) == joinpath(prefix, "include")
@test logdir(prefix) == joinpath(prefix, "logs")
@test logdir(prefix; subdir="test") == joinpath(prefix, "logs", "test")
end
end

Expand Down