bryan/hartman-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch from SCANS_DIR to PROJECT_SCANS_DIR to avoid collision

Browse Source
This commit is contained in:
Bryan Roessler
2024-07-29 12:09:10 -04:00
parent 4a2dbbbcd6
commit f27929eb1f
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/apps/matlab/easy/EASYconsole.m
View File

@@ -45,15 +45,15 @@ function varargout = EASYconsole(varargin)
scansDir=getenv('PROJECT');
fprintf('Using project path: %s from environment variable PROJECT\n', scansDir);
disp('This usually indicates that we are in standalone mode');
elseif exist('SCANS_DIR', 'var') && ~isempty(getenv('SCANS_DIR'))
scansDir=getenv('SCANS_DIR');
fprintf('Using scans directory: %s from environment variable SCANS_DIR\n', scansDir);
elseif exist('PROJECT_SCANS_DIR', 'var') && ~isempty(getenv('PROJECT_SCANS_DIR'))
scansDir=getenv('PROJECT_SCANS_DIR');
fprintf('Using scans directory: %s from environment variable PROJECT_SCANS_DIR\n', scansDir);
disp('This usually indicates that we are in module mode');
else
% TODO Lots of this is hardcoded logic, this TODO is just a reminder to change this block
% when changing EASY and other variables in the parent script
fprintf('Beginning parent scans directory search\n');
fprintf('This usually indicates that we are in stand-alone mode without PROJECT or SCANS_DIR environment variables\n');
fprintf('This usually indicates that we are in stand-alone mode without PROJECT or PROJECT_SCANS_DIR environment variables\n');
dirsToScan={
fullfile(parentDir,'..', '..', 'scans'),
fullfile(parentDir, '..', '..', 'ExpJobs'),