Commit 8ce5e7c4 authored by Jay Dubb's avatar Jay Dubb
Browse files

-- Sync minor differences in Intall and Utils with AtlasViewer

parent 92d8c204
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@echo off
@echo.
@echo.
@echo   PLEASE WAIT ... INSTALLTION WILL START IN A FEW MINUTES ...
@echo   PLEASE WAIT ... INSTALLATION WILL START IN A FEW MINUTES ...
@echo.
@move .\installtemp .\setup.exe
@echo.
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ try
catch ME
    close(h);
    printStack();
    msg{1} = sprintf('Error: Could not remove installation folder %s. It might be in use by other applications.\n', dirnameDst);
    msg{1} = sprintf('Error: Could not remove old installation folder %s. It might be in use by other applications.\n', dirnameDst);
    msg{2} = sprintf('Try closing and reopening file browsers or any other applications that might be using the\n');
    msg{3} = sprintf('installation folder and then retry installation.');
    menu([msg{:}], 'OK');
+8 −1
Original line number Diff line number Diff line
@@ -38,7 +38,14 @@ classdef Logger < handle
                end
            end
            
            self.Open();
            try
                self.fhandle = fopen(self.filename, 'wt');
            catch ME
                fprintf('Failed to open log file.\n');
                fprintf('    %s\n', ME.message);
                fprintf('    Will print output only to console\n');
                self.fhandle = -1;
            end
            
            self.options = struct(...
                'NULL',-1, ...
+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ function [r, toolboxes] = checkToolboxes(appname, options)
%   installed, 0 if some or all required toolboxes are not installed, and -1
%   if the operation to discover which toolboxes are needed and whether they are 
%   installed failed     

%   It first checks for the presense of the toolboxesRequired.txt file
%   for the list of required toolboxes to check for. If this file
%   does not exist, then it prompts the user to generate this file.
+9 −2
Original line number Diff line number Diff line
function b = ishandles(h)

b = false;
if isempty(h)
    b = 0;
    return;
else
    b = ishandle(h);
    for ii=1:length(h(:))
        if ~ishandle(h(ii))
            return;
        end
    end
end
b = true;