From ca364782805904de9ac2626824c13eb332c31c0d Mon Sep 17 00:00:00 2001
From: Norbert Marwan <marwan@pik-potsdam.de>
Date: Wed, 5 Jul 2023 17:52:49 +0200
Subject: [PATCH] bugfix in ignore files part simplifying code when checking
 for extensions

---
 makeinstall.m | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/makeinstall.m b/makeinstall.m
index 85be99f..4c558c7 100644
--- a/makeinstall.m
+++ b/makeinstall.m
@@ -616,13 +616,25 @@ function makeinstall(varargin)
         % additionally ignore makeinstall.rc, makeinstall.m, .cvsignore, and similar files
         i = 1;
         
-        ignore = [ignore, {'makeinstall.m'}, {'makeinstall.rc'}, {'.cvsignore'}, {'.git'}, {'.svn'}, {'.project'}, {'.texlipse'}, {'.sync'}, {'.DS_Store'}];
+        ignore = [ignore, {'makeinstall.m'}, {'makeinstall.rc'}, {'.cvsignore'}, {'.git'}, {'.svn'}, {'.project'}, {'.texlipse'}, {'.sync'}, {'.DS_Store'}, {'.gitignore'}];
         while i <= length(filenames)
             if i < 1, i = 1; end
-            [~, curr_file] = fileparts(filenames(i));
-            if ~include_pfiles, if strncmpi('p.',fliplr(filenames{i}),2), filenames(i) = []; i = i-1; end, end
+            [~, curr_file, ext] = fileparts(filenames(i));
+            if ~include_pfiles
+                if strcmpi(ext, '.p'), filenames(i) = []; i = i-1; end, 
+            end
+
             for j = 1:length(ignore)
-                if ~isempty(findstr(ignore{j},filenames{i})), filenames(i) = []; i = i-1; continue, end
+                if(strcmp('.gitignore', ignore{j}))
+                end
+                if ~isempty(findstr(ignore{j},filenames{i}))
+                    if i>=1
+                        filenames(i) = []; 
+                        i = i-1; 
+                        if i < 1, i = 1; end
+                    end
+                    continue
+                end
             end
             i = i+1;
         end
@@ -639,23 +651,27 @@ function makeinstall(varargin)
         end
 
         b = []; c = []; bfile = '';
-        for i = 1:length(filenames),
+        for i = 1:length(filenames)
+            [~, curr_file, ext] = fileparts(filenames(i));
             disp(['   Reading ', char(filenames{i}),''])
             fid = fopen(char(filenames{i}),'r');
 
             % ASCII data
             if ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'txt') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'xet') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'m') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'ldm') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'cr') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'lmx') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'ssc') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'gol') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'sj') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'lmth') || ...
-                strcmpi(lower(strtok(fliplr(filenames{i}),'.')),'mth')
+                strcmpi(ext,'.txt') || ...
+                strcmpi(ext,'.csv') || ...
+                strcmpi(ext,'.dat') || ...
+                strcmpi(ext,'.tex') || ...
+                strcmpi(ext,'.m') || ...
+                strcmpi(ext,'.mdl') || ...
+                strcmpi(ext,'.md') || ...
+                strcmpi(ext,'.rc') || ...
+                strcmpi(ext,'.xml') || ...
+                strcmpi(ext,'.css') || ...
+                strcmpi(ext,'.log') || ...
+                strcmpi(ext,'.js') || ...
+                strcmpi(ext,'.html') || ...
+                strcmpi(ext,'.htm')
 
                 c = [c, ['%<-- ASCII begins here: __',char(filenames{i}),'__ -->'], 10];
                 in = char(fread(fid)');