fix: use matlab_cmd provided as input closes #2442

satra · satra · commit b44bce4c0a1a · 2018-02-19T15:39:56.000-05:00
diff --git a/nipype/interfaces/spm/base.py b/nipype/interfaces/spm/base.py
@@ -186,7 +186,7 @@ def getinfo(klass, matlab_cmd=None, paths=None, use_mcr=None):
             }
 
         use_mcr = use_mcr or 'FORCE_SPMMCR' in os.environ
-        matlab_cmd = ((use_mcr and os.getenv('SPMMCRCMD'))
+        matlab_cmd = matlab_cmd or ((use_mcr and os.getenv('SPMMCRCMD'))
                       or os.getenv('MATLABCMD', 'matlab -nodesktop -nosplash'))
 
         mlab = MatlabCommand(matlab_cmd=matlab_cmd, resource_monitor=False)

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ def getinfo(klass, matlab_cmd=None, paths=None, use_mcr=None):`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`use_mcr = use_mcr or 'FORCE_SPMMCR' in os.environ`
`189`		`- matlab_cmd = ((use_mcr and os.getenv('SPMMCRCMD'))`
	`189`	`+ matlab_cmd = matlab_cmd or ((use_mcr and os.getenv('SPMMCRCMD'))`
`190`	`190`	`or os.getenv('MATLABCMD', 'matlab -nodesktop -nosplash'))`
`191`	`191`
`192`	`192`	`mlab = MatlabCommand(matlab_cmd=matlab_cmd, resource_monitor=False)`