Skip to content

Commit

Permalink
Add function to get scripts in bin dir according to JuliaLang/IJulia.…
Browse files Browse the repository at this point in the history 
…jl/pull/357
  • Loading branch information
@dhoegh
dhoegh committed Sep 16, 2015
1 parent 4e39b97 commit 42316b8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/Conda.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ using JSON

"Prefix for installation of all the packages."
const PREFIX = abspath(dirname(@__FILE__), "..", "deps", "usr")
@unix_only bindir(package) = joinpath(PREFIX, "bin", package)

This comment has been minimized.

Sign in to view

Copy link
@Luthaf

Luthaf Sep 16, 2015

On unix, bindir(package) = joinpath(PREFIX, "bin") should do the trick.

This comment has been minimized.

Sign in to view

Copy link
@dhoegh

dhoegh Sep 16, 2015

Author Owner

I thought the function as bindir(script) = joinpath(PREFIX, "bin", script) but your idea is also ok.
@windows_only bindir(package) = joinpath(PREFIX, "Scripts", package)

This comment has been minimized.

Sign in to view

Copy link
@Luthaf

Luthaf Sep 16, 2015

On Windows, bindir(package) = joinpath(PREFIX, "pkgs", version(package), "bin") might work, but this would need a check.

This comment has been minimized.

Sign in to view

Copy link
@dhoegh

dhoegh Sep 16, 2015

Author Owner

Im not sure what to do here. Because the folder joinpath(PREFIX, "Scripts") contains everything for JuliaLang/IJulia.jl#357.
image
and joinpath(PREFIX, "pkgs", version(package), "Scripts") contains mostly duplicates and some not present in joinpath(PREFIX, "Scripts"). joinpath(PREFIX, "pkgs", version(package), "Scripts") contains:
image

@unix_only const conda = joinpath(PREFIX, "bin", "conda")
@windows_only const conda = joinpath(PREFIX, "Scripts", "conda")
const conda = bindir("conda")

CHANNELS = AbstractString[]
additional_channels() = ["--channel " * channel for channel in CHANNELS]
Expand Down

0 comments on commit 42316b8

Please sign in to comment.