From 9b278fb97b57ea92316dfb928ff5a8ea60447bc0 Mon Sep 17 00:00:00 2001 From: rcassani Date: Thu, 1 Aug 2024 14:42:27 -0400 Subject: [PATCH] Distrib: `brainstorm.command` also look for full Matlab install --- bin/R2023a/brainstorm3.command | 15 ++++++++++----- doc/license.html | 2 +- doc/updates.txt | 9 +++++++++ doc/version.txt | 2 +- toolbox/core/bst_plugin.m | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) mode change 100644 => 100755 bin/R2023a/brainstorm3.command diff --git a/bin/R2023a/brainstorm3.command b/bin/R2023a/brainstorm3.command old mode 100644 new mode 100755 index ce22fc695..cbc34761b --- a/bin/R2023a/brainstorm3.command +++ b/bin/R2023a/brainstorm3.command @@ -52,16 +52,18 @@ if [ "$1" ]; then # Read the folder from the file elif [ -f $MFILE ]; then MATLABROOT=$(<$MFILE) +# macOS: Try the default installation folder for Matlab +elif [ $SYST == "maci64" ] && [ -d "/Applications/MATLAB_$VER_NAME.app" ]; then + MATLABROOT="/Applications/MATLAB_$VER_NAME.app" # macOS: Try the default installation folder for Matlab Runtime elif [ $SYST == "maci64" ] && [ -d "/Applications/MATLAB/MATLAB_Runtime/$VER_NAME" ]; then MATLABROOT="/Applications/MATLAB/MATLAB_Runtime/$VER_NAME" - echo "MATLAB Runtime library was found in folder:" - echo "$MATLABROOT" +# Linux: Try the default installation folder for Matlab +elif ([ $SYST == "glnx86" ] || [ $SYST == "glnxa64" ]) && [ -d "/usr/local/MATLAB/$VER_NAME" ]; then + MATLABROOT="/usr/local/MATLAB/$VER_NAME" # Linux: Try the default installation folder for Matlab Runtime elif ([ $SYST == "glnx86" ] || [ $SYST == "glnxa64" ]) && [ -d "/usr/local/MATLAB/MATLAB_Runtime/$VER_NAME" ]; then MATLABROOT="/usr/local/MATLAB/MATLAB_Runtime/$VER_NAME" - echo "MATLAB Runtime library was found in folder:" - echo "$MATLABROOT" # Run the java file selector else java -classpath "$JAR_FILE" org.brainstorm.file.SelectMcr$VER_YEAR_VERSION @@ -83,7 +85,7 @@ if [ -z "$MATLABROOT" ]; then echo "run executables compiled with Matlab $VER_NAME." echo " " echo "Default Matlab Runtime installation folders:" - echo " Linux: /usr/local/MATLAB_Runtime/$VER_NAME" + echo " Linux: /usr/local/MATLAB_Runtime/$VER_NAME" echo " macOS: /Applications/MATLAB/MATLAB_Runtime/v$VER_NAME" echo " " echo "MATLABROOT has to be specified only at the first call," @@ -114,6 +116,9 @@ fi if [ ! -d "$MDIR" ]; then mkdir $MDIR fi +# Matlab path found +echo "Matlab $VER_NAME found:" +echo "$MATLABROOT" # Save Matlab path in user folder echo "$MATLABROOT" > $MFILE diff --git a/doc/license.html b/doc/license.html index 797f86b90..a6a90e8bb 100644 --- a/doc/license.html +++ b/doc/license.html @@ -5,7 +5,7 @@

THERE IS NO UNDO BUTTON!
SET UP A BACKUP OF YOUR DATABASE

-Version: 3.240730 (30-Jul-2024)
+Version: 3.240801 (01-Aug-2024)
COPYRIGHT © 2000-2024 USC & McGill University.
 diff --git a/doc/updates.txt b/doc/updates.txt index 36394ed08..cee407a21 100644 --- a/doc/updates.txt +++ b/doc/updates.txt @@ -1,3 +1,12 @@ +July 2024 +- Anatomy: Import output from FreeSurfer recon-all-clinical +- Bugfix: Importing non-Atlas MRI volumes given in MNI space +- Inverse: Process to apply exclusion zone around sensors for volume grids +- Artifacts: New process for automatic detection of artifacts on MEG +- Plugins: Add mTRF-Toolbox and Zeffiro +- Plugins: OpenMEEG and MCXLAB now support Apple Silicon +- Distrib: Menu option to retrieve system information +-------------------------------------------------------------- June 2024 - Anatomy: Bugfix, set proper subtype on importing Fibers and FEM - Viz: Allow combination of resection options in Fig3D diff --git a/doc/version.txt b/doc/version.txt index e9e337ced..fa90fbe81 100644 --- a/doc/version.txt +++ b/doc/version.txt @@ -1,2 +1,2 @@ % Brainstorm -% v. 3.240730 (30-Jul-2024) \ No newline at end of file +% v. 3.240801 (01-Aug-2024) \ No newline at end of file diff --git a/toolbox/core/bst_plugin.m b/toolbox/core/bst_plugin.m index 0de665603..f3a59a401 100644 --- a/toolbox/core/bst_plugin.m +++ b/toolbox/core/bst_plugin.m @@ -221,7 +221,7 @@ PlugDesc(end).URLinfo = 'https://github.com/sampsapursiainen/zeffiro_interface'; PlugDesc(end).TestFile = 'zeffiro_downloader.m'; PlugDesc(end).ReadmeFile = 'README.md'; - PlugDesc(end).CompiledStatus = 2; + PlugDesc(end).CompiledStatus = 0; PlugDesc(end).LoadFolders = {'*'}; PlugDesc(end).DeleteFiles = {'.gitignore'};