From d2ddbc2b567c8e23949084b03befbf8b807be488 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Tue, 3 Sep 2019 13:10:27 +0200
Subject: [PATCH] =?UTF-8?q?suppress=20output=20from=20mkdir=20in=20octave,?=
=?UTF-8?q?=20check=20for=20=E2=80=98dir=E2=80=99=20instead=20of=20?=
=?UTF-8?q?=E2=80=98file=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/@graph/writeGraphFile.m | 4 ++--
src/@page/write.m | 7 ++-----
src/@report/write.m | 4 ++--
src/@report_table/writeTableFile.m | 4 ++--
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/@graph/writeGraphFile.m b/src/@graph/writeGraphFile.m
index a660ffe..0c0cf30 100644
--- a/src/@graph/writeGraphFile.m
+++ b/src/@graph/writeGraphFile.m
@@ -39,8 +39,8 @@ if ne < 1
return
end
-if exist([rep_dir filesep o.graphDirName], 'file') ~= 7
- mkdir([rep_dir filesep o.graphDirName])
+if exist([rep_dir filesep o.graphDirName], 'dir') ~= 7
+ mkdir([rep_dir filesep o.graphDirName]);
end
if isempty(o.graphName)
graphName = sprintf([o.graphDirName filesep 'graph_pg%d_sec%d_row%d_col%d.tex'], pg, sec, row, col);
diff --git a/src/@page/write.m b/src/@page/write.m
index 63b2675..51e4a6a 100644
--- a/src/@page/write.m
+++ b/src/@page/write.m
@@ -42,12 +42,9 @@ end
fprintf(fid, '\n');
if ~isempty(o.latex)
- if ~exist(o.pageDirName, 'dir')
- mkdir(o.pageDirName)
- end
dir = [rep_dir filesep o.pageDirName];
- if exist(dir, 'file') ~= 7
- mkdir(dir)
+ if exist(dir, 'dir') ~= 7
+ mkdir(dir);
end
pagename = [dir filesep 'page_' num2str(pg) '.tex'];
[fidp, msg] = fopen(pagename, 'w');
diff --git a/src/@report/write.m b/src/@report/write.m
index c4958e7..0707f93 100644
--- a/src/@report/write.m
+++ b/src/@report/write.m
@@ -28,8 +28,8 @@ function o = write(o)
% You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
-if exist(o.directory, 'file') ~= 7
- mkdir(o.directory)
+if exist(o.directory, 'dir') ~= 7
+ mkdir(o.directory);
end
[fid, msg] = fopen([o.directory filesep o.fileName], 'w');
if fid == -1
diff --git a/src/@report_table/writeTableFile.m b/src/@report_table/writeTableFile.m
index 695b26c..bfc2a9b 100644
--- a/src/@report_table/writeTableFile.m
+++ b/src/@report_table/writeTableFile.m
@@ -40,8 +40,8 @@ if ne == 0 && ~is_data_table
return
end
-if exist([rep_dir filesep o.tableDirName], 'file') ~= 7
- mkdir([rep_dir filesep o.tableDirName])
+if exist([rep_dir filesep o.tableDirName], 'dir') ~= 7
+ mkdir([rep_dir filesep o.tableDirName]);
end
if isempty(o.tableName)
tableName = sprintf([o.tableDirName filesep 'table_pg%d_sec%d_row%d_col%d.tex'], pg, sec, row, col);
--
GitLab