pfs_shell.m (pfstools-2.1.0.tgz) | : | pfs_shell.m (pfstools-2.2.0.tgz) | ||
---|---|---|---|---|
skipping to change at line 27 | skipping to change at line 27 | |||
if( ~exist( 'suffix', 'var' ) ) | if( ~exist( 'suffix', 'var' ) ) | |||
work_dir = strrep(pwd(),'\','/'); | work_dir = strrep(pwd(),'\','/'); | |||
% It is necessary to set all ENV variables before invoking | % It is necessary to set all ENV variables before invoking | |||
% pfstools commands. '/bin/bash' may need to be replaced with the | % pfstools commands. '/bin/bash' may need to be replaced with the | |||
% shell you are using. | % shell you are using. | |||
% This will remove all references to matlab libraries from the | % This will remove all references to matlab libraries from the | |||
% LD_LIBRARY_PATH. pfstools usually do not work with matlab version | % LD_LIBRARY_PATH. pfstools usually do not work with matlab version | |||
% of the standard libraries | % of the standard libraries | |||
set_ld_path='export LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed "y/:/\n /" | grep -v "matlab" | sed ":beg;N;s/\n/:/;t beg;"`'; | set_ld_path='export LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | sed "y/:/\n /" | grep --ignore-case -v "matlab" | sed ":beg;N;s/\n/:/;t beg;"`'; | |||
if( strcmp( computer, 'MACI64' ) || strcmp( computer, 'MACI32' ) ) | if( strcmp( computer, 'MACI64' ) || strcmp( computer, 'MACI32' ) ) | |||
set_ld_path=cat( 2, set_ld_path, '; export DYLD_FRAMEWORK_PATH=`echo $DYLD_FRAMEWORK_PATH | sed "y/:/\n/" | grep -v "matlab" | sed ":beg;N;s/\n/:/;t beg;"`' ); | set_ld_path=cat( 2, set_ld_path, '; export DYLD_FRAMEWORK_PATH=`echo $DYLD_FRAMEWORK_PATH | sed "y/:/\n/" | grep --ignore-case -v "matlab" | sed ":b eg;N;s/\n/:/;t beg;"`' ); | |||
end | end | |||
% Start shell, cd to the working directory and remove matlab | % Start shell, cd to the working directory and remove matlab | |||
% libraries | % libraries | |||
cmd = sprintf('/bin/bash -l -c ''cd "%s"; %s;', work_dir, set_ld_path ); | cmd = sprintf('/bin/bash -l -c ''cd "%s"; %s;', work_dir, set_ld_path ); | |||
else | else | |||
cmd=''''; | cmd=''''; | |||
end | end | |||
end | end | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |