Fix JuliaLang#363, the if statement should only be necessary when jup…

…yter is not in path as suggested in jupyter/notebook#448
dhoegh · Sep 27, 2015 · bfc4cad · bfc4cad
1 parent 855235f
commit bfc4cad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deps/build.jl b/deps/build.jl
@@ -96,7 +96,7 @@ copy_config("logo-32x32.png", juliakspec)
 copy_config("logo-64x64.png", juliakspec)
 
 eprintln("Installing julia kernelspec $spec_name")
-if basename(jupyter) == "jupyter"
+if basename(jupyter) == "jupyter" && dirname(jupyter) == abspath(Conda.SCRIPTDIR)
     # Remove the commit that added this when https://github.com/jupyter/notebook/issues/448 is closed
     run(`$jupyter-kernelspec install --replace --user $juliakspec`)
 else

diff --git a/src/IJulia.jl b/src/IJulia.jl
@@ -196,7 +196,7 @@ end
 export notebook
 function notebook(jupyter=jupyter)
     inited && error("IJulia is already running")
-    if basename(jupyter) == "jupyter"
+    if basename(jupyter) == "jupyter" && dirname(jupyter) == abspath(Conda.SCRIPTDIR)
         # Remove the commit that added this when https://github.com/jupyter/notebook/issues/448 is closed
         run(`$jupyter-notebook`)
     else