Skip to content

Commit

Permalink
Merge pull request #40 from phobon/dev
Browse files Browse the repository at this point in the history
Fix readall and isexecutable deprecations
  • Loading branch information
tkelman committed Feb 11, 2016
2 parents c2812ca + 5da6be2 commit cc44a6e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
julia 0.3
Compat
Compat 0.7.9
4 changes: 2 additions & 2 deletions src/mxbase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function get_paths()

if matlab_homepath == ""
if OS_NAME == :Linux
matlab_homepath = dirname(dirname(realpath(chomp(readall(`which matlab`)))))
matlab_homepath = dirname(dirname(realpath(chomp(readstring(`which matlab`)))))
elseif OS_NAME == :Darwin
apps = readdir("/Applications")
filter!(app -> ismatch(r"^MATLAB_R[0-9]+[ab]\.app$", app), apps)
Expand All @@ -37,7 +37,7 @@ function get_paths()

if OS_NAME != :Windows
default_startcmd = joinpath(matlab_homepath, "bin", "matlab")
if !isexecutable(default_startcmd)
if !isfile(default_startcmd)
error("The MATLAB path is invalid. Set the MATLAB_HOME evironmental variable to the MATLAB root.")
end
default_startcmd = "exec $(Base.shell_escape(default_startcmd)) -nosplash"
Expand Down

0 comments on commit cc44a6e

Please sign in to comment.