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.

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

Jump to bottom

Fix recent homebrew reorganization breakage #149

Merged
merged 3 commits into from Sep 20, 2016
Merged

Fix recent homebrew reorganization breakage #149

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
58ba28c
Follow Homebrew's lead with with `linked()`
staticfloat Sep 20, 2016
5ba1e9e
Add another explanatory `info()`
staticfloat Sep 20, 2016
b571d41
Update travis config
staticfloat Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions .travis.yml
View file
Open in desktop
@@ -1,10 +1,15 @@
language: julia
os:
- osx
julia:
- 0.4
- 0.5
- nightly
matrix:
include:
- os: osx
osx_image: xcode7.3
julia: 0.4
- os: osx
osx_image: xcode7.3
julia: 0.5
- os: osx
osx_image: xcode7.3
julia: nightly
notifications:
email: false
after_success:
Expand Down
2 changes: 1 addition & 1 deletion src/private_API.jl
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ all files installed by this package have been linked into the global prefix.
function linked(pkg::StringOrPkg) end

function linked(name::AbstractString)
return islink(joinpath(brew_prefix,"Library","LinkedKegs",basename(name)))
return islink(joinpath(brew_prefix,"var","homebrew","linked",basename(name)))
end

function linked(pkg::BrewPkg)
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
View file
Open in desktop
Expand Up @@ -108,6 +108,7 @@ Homebrew.delete_all_translated_formulae(verbose=true)
# Test deletion as well, showing that the array-argument form continues on after errors
Homebrew.rm(pkgconfig)
Homebrew.add(pkgconfig)
info("rm() should fail because this isn't actually a package name:")
Homebrew.rm(["thisisntapackagename", "pkg-config"])
@test Homebrew.installed("pkg-config") == false
@test Homebrew.linked("pkg-config") == false
Expand Down