fix finding plotly wrapper directory logic

Author: bronsolo

plotly/plotly_setup_aux/plotlycleanup.m

@@ -26,25 +26,23 @@
     return
 end
 
+% plotly toolbox directory
+plotlyToolboxDir = fullfile(matlabroot,'toolbox','plotly');
+
 % find the location of all plotly/ directories
 dircount = 1; 
 for d = 1:length(plotlyScriptDirs)
     %parse filepath string at the Plotly directory
     plotlyLoc = strfind(fileparts(plotlyScriptDirs{d}),fullfile('MATLAB-api','plotly'));
+    plotlyToolboxLoc = strfind(fileparts(plotlyScriptDirs{d}),plotlyToolboxDir); 
     if ~isempty(plotlyLoc)
         plotlyDirs{dircount} = fullfile(plotlyScriptDirs{d}(1:plotlyLoc-1),'MATLAB-api','plotly');
+    elseif ~isempty(plotlyToolboxLoc)
+        plotlyDirs{dircount} = plotlyToolboxDir;
     end
     dircount = dircount + 1; 
 end
 
-% plotly toolbox directory
-plotlyToolboxDir = fullfile(matlabroot,'toolbox','plotly');
-
-% MATLAB toolbox plotly
-if exist(plotlyToolboxDir, 'dir');
-    plotlyDirs{end+1} = plotlyToolboxDir;
-end
-
 for d = 1:length(plotlyDirs)
 
     % add plotlydirs to searchpath (will be removed in future once handled by plotlyupdate)

plotly/plotly_setup_aux/plotlyupdate.m

@@ -67,25 +67,23 @@ function plotlyupdate(varargin)
     return
 end
 
+% plotly toolbox directory
+plotlyToolboxDir = fullfile(matlabroot,'toolbox','plotly');
+
 % find the location of all plotly/ directories
 dircount = 1; 
 for d = 1:length(plotlyScriptDirs)
     %parse filepath string at the Plotly directory
     plotlyLoc = strfind(fileparts(plotlyScriptDirs{d}),fullfile('MATLAB-api','plotly'));
+    plotlyToolboxLoc = strfind(fileparts(plotlyScriptDirs{d}),plotlyToolboxDir); 
     if ~isempty(plotlyLoc)
         plotlyDirs{dircount} = fullfile(plotlyScriptDirs{d}(1:plotlyLoc-1),'MATLAB-api','plotly');
+    elseif ~isempty(plotlyToolboxLoc)
+        plotlyDirs{dircount} = plotlyToolboxDir;
     end
     dircount = dircount + 1; 
 end
 
-% plotly toolbox directory
-plotlyToolboxDir = fullfile(matlabroot,'toolbox','plotly');
-
-% MATLAB toolbox plotly
-if exist(plotlyToolboxDir, 'dir');
-    plotlyDirs{end+1} = plotlyToolboxDir;
-end
-
 %----update if necessary----%
 if strcmp(pvLocal,pvRemote)
     fprintf(['\nYour Plotly API MATLAB Library v.' pvRemote ' is already up to date! \n\n'])