Distrib: brainstorm.command also look for full Matlab install

brainstorm-tools · Aug 1, 2024 · 9b278fb · 9b278fb
1 parent 4824573
commit 9b278fb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git 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
@@ -5,7 +5,7 @@
 <body alink="#fff000" link="#fff000" vlink="#fff000">
  <h4><span style="font-family: Arial Black; color: #ffffff;"><strong>THERE IS NO UNDO BUTTON!<BR>SET UP A <FONT color=red>BACKUP</FONT> OF YOUR DATABASE</strong></span></h4>
 <HR>
-<!-- LICENCE_START -->Version: 3.240730 (30-Jul-2024)<br>
+<!-- LICENCE_START -->Version: 3.240801 (01-Aug-2024)<br>
 <span style="font-style: italic;">COPYRIGHT &copy; 2000-2024
 USC &amp; McGill University.<br>
 </span>

diff --git 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
@@ -1,2 +1,2 @@
 % Brainstorm
-% v. 3.240730 (30-Jul-2024)
+% v. 3.240801 (01-Aug-2024)
diff --git 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'};