improve install cocosim script to take into account no access to the …

…internet

scripts/install_cocosim_lib.m

@@ -61,14 +61,21 @@ function install_cocosim_lib(force)
         force = false;
     end
     if install_cocosim_already_run && ~force
+        fprintf('Install CoCoSim external libraries is already run and will be ignored.\nTo force it run "install_cocosim_lib(true)" in your Matlab Command Window.\n')
         return;
     end
     PWD = pwd;
+    scripts_path = fileparts(mfilename('fullpath'));
+    cocosim_path = fileparts(scripts_path);
+    %% install binaries: Zustre, Kind2, Lustrec, Z3 ...
+    install_tools(cocosim_path);
+
+    %% the following requires internet access.
     [status, ~] = system('ping -c1 -q google.com');
     if status
         %No netwrok connexion
-        fprintf(['No interent connexion. Repository will not be updated and '...
-            '\n External libraries should be manually added.'])
+        fprintf(['No interent connexion. Repository will not be updated.\n'...
+            'If it''s your first run of CoCoSim, external libraries should be manually added if you don''t have access to the internet.\n'])
         return;
     end
     [status, ~] = system('git help');
@@ -81,16 +88,13 @@ function install_cocosim_lib(force)
             'setenv(''PATH'', [getenv(''PATH'') '';C:\\Program Files\\Git\\cmd''])\n'])
         return;
     end
-    scripts_path = fileparts(mfilename('fullpath'));
-    cocosim_path = fileparts(scripts_path);
     %% update cocosim
     updateRepo(cocosim_path)
     %% copy files from cocosim in github
     copyCoCoFiles(force, cocosim_path);
     %% copy file from external libraries : Autolayout, cmd_timeout, html_lib
     copyExternalLibFiles(force, cocosim_path);
-    %% install binaries: Zustre, Kind2, Lustrec, Z3 ...
-    install_tools(cocosim_path);
+
 
     cd(PWD);
 end
@@ -284,7 +288,7 @@ function copyExternalLibFiles(force, cocosim_path)
 %     catch ME
 %         switch ME.identifier
 %             case 'MATLAB:fileread:cannotOpenFile'
-%                 fprintf('Patch failed: Can''t open file %s', file_path);
+%                 fprintf('Patch failed: Can''t open file %s\n', file_path);
 %             otherwise
 %                 rethrow(ME)
 %         end

start_cocosim.m

@@ -52,12 +52,18 @@ function start_cocosim(  )
     disp('... Starting cocoSim configuration')
     [cocoSim_root, ~, ~] = fileparts(mfilename('fullpath'));
     addpath(fullfile(cocoSim_root, 'scripts'));
-    % Enable this to update cocosim repo, or call it directly from workspace
-    display_msg_path = fullfile(cocoSim_root, 'src', 'external', 'cocosim_iowa', 'utils', 'display_msg.m');
-    if ~exist(display_msg_path, 'file')
-        % external libraries are missing
+
+    % Update CoCoSim Repo
+    %display_msg_path = fullfile(cocoSim_root, 'src', 'external', 'cocosim_iowa', 'utils', 'display_msg.m');
+    %if ~exist(display_msg_path, 'file')
+    % external libraries are missing
+    try
         install_cocosim_lib();
+    catch
+        fprintf('Install CoCoSim external libraries failed. Ignore it if your CoCoSim has all required files.')
     end
+    %end
+
     cocosim_config;
     warning('off');
     sl_refresh_customizations;

tools/tools_config.m

@@ -68,6 +68,7 @@
 end
 if tools_config_already_run && ~isempty(LUSTREC) && ~isempty(KIND2)...
         && ~isempty(Z3) && ~isempty(YICES2)
+    fprintf('Tools config is already run and will be ignored.\nTo force it run "tools_config" in your Matlab Command Window.\n')
     %already run
 else
     [tools_root, ~, ~] = fileparts(which('tools_config')); %fileparts(mfilename('fullpath'));