Merge pull request #1511 from MRtrix3/fsl_eddybinary_mac_fix

dwipreproc: Search PATH for 'eddy_cpu'
MRtrix3 · Dec 12, 2018 · ae63c77 · ae63c77
2 parents d7f497c + d9a9123
commit ae63c77
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/mrtrix3/fsl.py b/lib/mrtrix3/fsl.py
@@ -58,9 +58,12 @@ def eddyBinary(cuda): #pylint: disable=unused-variable
       return exe_path
     app.debug('No CUDA version of eddy found')
     return ''
-  exe_path = 'eddy_openmp' if find_executable('eddy_openmp') else exeName('eddy')
-  app.debug(exe_path)
-  return exe_path
+  for candidate in [ 'eddy_openmp', 'eddy_cpu', 'eddy', 'fsl5.0-eddy' ]:
+    if find_executable(candidate):
+      app.debug(candidate)
+      return candidate
+  app.debug('No CPU version of eddy found')
+  return ''