diff options
author | Ruben Undheim <ruben.undheim@gmail.com> | 2016-07-06 18:24:09 +0200 |
---|---|---|
committer | Ruben Undheim <ruben.undheim@gmail.com> | 2018-11-27 18:59:05 +0100 |
commit | 618fb1856dedb345f86c01d977787187ec1d4267 (patch) | |
tree | aeadf1d50967eed01d64e7aa40780cdbeafcc1bc /openEMS | |
parent | 538db04b97c27896505434bb9a4bf3ceb817eec8 (diff) |
Fix path to binaries for Debian
Gbp-Pq: Name 0001-Fix-path-to-binaries-for-Debian.patch
Diffstat (limited to 'openEMS')
-rw-r--r-- | openEMS/matlab/CalcNF2FF.m | 15 | ||||
-rw-r--r-- | openEMS/matlab/private/invoke_openEMS.m | 16 |
2 files changed, 17 insertions, 14 deletions
diff --git a/openEMS/matlab/CalcNF2FF.m b/openEMS/matlab/CalcNF2FF.m index c80b52e..07cc849 100644 --- a/openEMS/matlab/CalcNF2FF.m +++ b/openEMS/matlab/CalcNF2FF.m @@ -98,13 +98,14 @@ struct_2_xml(nf2ff.xml,nf2ff_xml,'nf2ff'); m_filename = mfilename('fullpath'); dir_name = fileparts( m_filename ); -if isunix - nf2ff_bin = searchBinary('nf2ff', ... - {[dir_name filesep '..' filesep 'nf2ff' filesep], ... - [dir_name filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}, 0); -else - nf2ff_bin = searchBinary('nf2ff.exe',[dir_name filesep '..' filesep], 0); -end +%if isunix +% nf2ff_bin = searchBinary('nf2ff', ... +% {[dir_name filesep '..' filesep 'nf2ff' filesep], ... +% [dir_name filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}, 0); +%else +% nf2ff_bin = searchBinary('nf2ff.exe',[dir_name filesep '..' filesep], 0); +%end +nf2ff_bin = '/usr/bin/nf2ff'; if ((exist(nf2ff.hdf5,'file') && (mode==0)) || (mode==2)) disp('CalcNF2FF: Reading nf2ff data only...') diff --git a/openEMS/matlab/private/invoke_openEMS.m b/openEMS/matlab/private/invoke_openEMS.m index afb2b46..8c4d79b 100644 --- a/openEMS/matlab/private/invoke_openEMS.m +++ b/openEMS/matlab/private/invoke_openEMS.m @@ -26,13 +26,15 @@ end filename = mfilename('fullpath'); dir = fileparts( filename ); -if isunix - openEMS_bin = searchBinary('openEMS.sh', ... - {[dir filesep '..' filesep '..' filesep], ... % try devel path - [dir filesep '..' filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}); % try (default) install path -else % assume windows - openEMS_bin = searchBinary('openEMS.exe', [dir filesep '..' filesep '..' filesep]); -end +%if isunix +% openEMS_bin = searchBinary('openEMS.sh', ... +% {[dir filesep '..' filesep '..' filesep], ... % try devel path +% [dir filesep '..' filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}); % try (default) install path +%else % assume windows +% openEMS_bin = searchBinary('openEMS.exe', [dir filesep '..' filesep '..' filesep]); +%end + +openEMS_bin = '/usr/bin/openEMS'; command = [openEMS_bin ' ' opts]; |