Mercurial > octave
changeset 25787:3293cd2651fb
prefer 'isfolder' over 'exist (..., "dir")' in Octave functions
* javaaddpath.m, javarmpath.m, edit.m, run.m, pkg.m, build.m,
configure_make.m, dirempty.m, install.m, load_packages_and_dependencies.m,
uninstall.m, unload_packages.m, util/print.m, getpref.m, prefdir.m, setpref.m,
profexport.m, dump_demos.m: Use 'isfolder' instead of 'exist (..., "dir")'.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Tue, 14 Aug 2018 11:17:26 -0700 |
| parents | b102a94cc3b2 |
| children | 88e87c69c8b8 |
| files | scripts/java/javaaddpath.m scripts/java/javarmpath.m scripts/miscellaneous/edit.m scripts/miscellaneous/run.m scripts/pkg/pkg.m scripts/pkg/private/build.m scripts/pkg/private/configure_make.m scripts/pkg/private/dirempty.m scripts/pkg/private/install.m scripts/pkg/private/load_packages_and_dependencies.m scripts/pkg/private/uninstall.m scripts/pkg/private/unload_packages.m scripts/plot/util/print.m scripts/prefs/getpref.m scripts/prefs/prefdir.m scripts/prefs/setpref.m scripts/profiler/profexport.m scripts/testfun/private/dump_demos.m |
| diffstat | 18 files changed, 42 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/java/javaaddpath.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/java/javaaddpath.m Tue Aug 14 11:17:26 2018 -0700 @@ -41,7 +41,7 @@ endif new_path = canonicalize_file_name (tilde_expand (clspath)); - if (exist (new_path, "dir")) + if (isfolder (new_path)) if (new_path(end) != filesep ()) new_path = [new_path, filesep()]; endif
--- a/scripts/java/javarmpath.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/java/javarmpath.m Tue Aug 14 11:17:26 2018 -0700 @@ -42,7 +42,7 @@ endif old_path = canonicalize_file_name (tilde_expand (clspath)); - if (exist (old_path, "dir")) + if (isfolder (old_path)) if (old_path(end) != filesep ()) old_path = [old_path, filesep()]; endif
--- a/scripts/miscellaneous/edit.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/miscellaneous/edit.m Tue Aug 14 11:17:26 2018 -0700 @@ -220,7 +220,7 @@ ## Start the editor without a file if no file is given. if (nargin == 0) - if (exist (FUNCTION.HOME, "dir") == 7) + if (isfolder (FUNCTION.HOME)) curr_dir = pwd (); unwind_protect cd (FUNCTION.HOME);
--- a/scripts/miscellaneous/run.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/miscellaneous/run.m Tue Aug 14 11:17:26 2018 -0700 @@ -59,7 +59,7 @@ endif if (! isempty (d)) - if (! exist (d, "dir")) + if (! isfolder (d)) error ("run: the path %s doesn't exist", d); endif
--- a/scripts/pkg/pkg.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/pkg.m Tue Aug 14 11:17:26 2018 -0700 @@ -474,7 +474,7 @@ global_packages = archprefix; elseif (numel (files) >= 1 && ischar (files{1})) prefix = tilde_expand (files{1}); - if (! exist (prefix, "dir")) + if (! isfolder (prefix)) [status, msg] = mkdir (prefix); if (status == 0) error ("pkg: cannot create prefix %s: %s", prefix, msg); @@ -485,7 +485,7 @@ user_prefix = true; if (numel (files) >= 2 && ischar (files{2})) archprefix = tilde_expand (files{2}); - if (! exist (archprefix, "dir")) + if (! isfolder (archprefix)) [status, msg] = mkdir (archprefix); if (status == 0) error ("pkg: cannot create archprefix %s: %s", archprefix, msg);
--- a/scripts/pkg/private/build.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/private/build.m Tue Aug 14 11:17:26 2018 -0700 @@ -38,7 +38,7 @@ print_usage (); endif - if (! exist (builddir, "dir")) + if (! isfolder (builddir)) warning ("creating build directory %s", builddir); [status, msg] = mkdir (builddir); if (status != 1)
--- a/scripts/pkg/private/configure_make.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/private/configure_make.m Tue Aug 14 11:17:26 2018 -0700 @@ -25,7 +25,7 @@ function configure_make (desc, packdir, verbose) ## Perform ./configure, make, make install in "src". - if (exist (fullfile (packdir, "src"), "dir")) + if (isfolder (fullfile (packdir, "src"))) src = fullfile (packdir, "src"); octave_bindir = __octave_config_info__ ("bindir"); ver = version ();
--- a/scripts/pkg/private/dirempty.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/private/dirempty.m Tue Aug 14 11:17:26 2018 -0700 @@ -24,7 +24,7 @@ function emp = dirempty (nm, ign) - if (exist (nm, "dir")) + if (isfolder (nm)) if (nargin < 2) ign = {".", ".."}; else
--- a/scripts/pkg/private/install.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/private/install.m Tue Aug 14 11:17:26 2018 -0700 @@ -26,7 +26,7 @@ local_list, global_list, global_install) ## Check that the directory in prefix exist. If it doesn't: create it! - if (! exist (prefix, "dir")) + if (! isfolder (prefix)) warning ("creating installation directory %s", prefix); [status, msg] = mkdir (prefix); if (status != 1) @@ -92,11 +92,11 @@ endif ## The filename pointed to an uncompressed package to begin with. - if (exist (tgz, "dir")) + if (isfolder (tgz)) dirlist = {".", "..", tgz}; endif - if (exist (tgz, "file") || exist (tgz, "dir")) + if (exist (tgz, "file") || isfolder (tgz)) ## The two first entries of dirlist are "." and "..". if (exist (tgz, "file")) packdir = fullfile (tmpdir, dirlist{3}); @@ -278,7 +278,7 @@ ## All is well, let's clean up. for i = 1:length (tmpdirs) [status, msg] = rmdir (tmpdirs{i}, "s"); - if (status != 1 && exist (tmpdirs{i}, "dir")) + if (status != 1 && isfolder (tmpdirs{i})) warning ("couldn't clean up after my self: %s\n", msg); endif endfor @@ -349,7 +349,7 @@ ## If the directory "inst" doesn't exist, we create it. inst_dir = fullfile (packdir, "inst"); - if (! exist (inst_dir, "dir")) + if (! isfolder (inst_dir)) [status, msg] = mkdir (inst_dir); if (status != 1) rmdir (desc.dir, "s"); @@ -364,7 +364,7 @@ function copy_built_files (desc, packdir, verbose) src = fullfile (packdir, "src"); - if (! exist (src, "dir")) + if (! isfolder (src)) return endif @@ -415,7 +415,7 @@ ## Copy the files. if (! all (isspace ([filenames{:}]))) - if (! exist (instdir, "dir")) + if (! isfolder (instdir)) mkdir (instdir); endif if (! all (isspace ([archindependent{:}]))) @@ -436,7 +436,7 @@ printf (" %s", archdependent{:}); printf (" %s\n", archdir); endif - if (! exist (archdir, "dir")) + if (! isfolder (archdir)) mkdir (archdir); endif [status, output] = copyfile (archdependent, archdir); @@ -478,7 +478,7 @@ function copy_files (desc, packdir, global_install) ## Create the installation directory. - if (! exist (desc.dir, "dir")) + if (! isfolder (desc.dir)) [status, output] = mkdir (desc.dir); if (status != 1) error ("couldn't create installation directory %s : %s", @@ -496,17 +496,17 @@ rmdir (desc.dir, "s"); error ("couldn't copy files to the installation directory"); endif - if (exist (fullfile (desc.dir, getarch ()), "dir") + if (isfolder (fullfile (desc.dir, getarch ())) && ! strcmp (canonicalize_file_name (fullfile (desc.dir, getarch ())), canonicalize_file_name (octfiledir))) - if (! exist (octfiledir, "dir")) + if (! isfolder (octfiledir)) ## Can be required to create up to three levels of dirs. octm1 = fileparts (octfiledir); - if (! exist (octm1, "dir")) + if (! isfolder (octm1)) octm2 = fileparts (octm1); - if (! exist (octm2, "dir")) + if (! isfolder (octm2)) octm3 = fileparts (octm2); - if (! exist (octm3, "dir")) + if (! isfolder (octm3)) [status, output] = mkdir (octm3); if (status != 1) rmdir (desc.dir, "s"); @@ -584,14 +584,14 @@ ## Is there a doc/ directory that needs to be installed? docdir = fullfile (packdir, "doc"); - if (exist (docdir, "dir") && ! dirempty (docdir)) + if (isfolder (docdir) && ! dirempty (docdir)) [status, output] = copyfile (docdir, desc.dir); endif ## Is there a bin/ directory that needs to be installed? ## FIXME: Need to treat architecture dependent files in bin/ bindir = fullfile (packdir, "bin"); - if (exist (bindir, "dir") && ! dirempty (bindir)) + if (isfolder (bindir) && ! dirempty (bindir)) [status, output] = copyfile (bindir, desc.dir); endif @@ -632,7 +632,7 @@ for k = 1:length (class_idx) class_name = files {class_idx(k)}; class_dir = fullfile (dir, class_name); - if (exist (class_dir, "dir")) + if (isfolder (class_dir)) [files2, err, msg] = readdir (class_dir); if (err) error ("couldn't read directory %s: %s", class_dir, msg); @@ -644,7 +644,7 @@ ## Check for architecture dependent files. tmpdir = getarchdir (desc); - if (exist (tmpdir, "dir")) + if (isfolder (tmpdir)) [files2, err, msg] = readdir (tmpdir); if (err) error ("couldn't read directory %s: %s", tmpdir, msg); @@ -695,7 +695,7 @@ ## part in the main directory. archdir = fullfile (getarchprefix (desc, global_install), [desc.name "-" desc.version], getarch ()); - if (exist (getarchdir (desc, global_install), "dir")) + if (isfolder (getarchdir (desc, global_install))) archpkg = fullfile (getarchdir (desc, global_install), nm); archfid = fopen (archpkg, "at"); else
--- a/scripts/pkg/private/load_packages_and_dependencies.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/private/load_packages_and_dependencies.m Tue Aug 14 11:17:26 2018 -0700 @@ -31,13 +31,13 @@ for i = idx; ndir = installed_pkgs_lst{i}.dir; dirs{end+1} = ndir; - if (exist (fullfile (dirs{end}, "bin"), "dir")) + if (isfolder (fullfile (dirs{end}, "bin"))) execpath = [execpath pathsep() fullfile(dirs{end}, "bin")]; endif tmpdir = getarchdir (installed_pkgs_lst{i}); - if (exist (tmpdir, "dir")) + if (isfolder (tmpdir)) dirs{end + 1} = tmpdir; - if (exist (fullfile (dirs{end}, "bin"), "dir")) + if (isfolder (fullfile (dirs{end}, "bin"))) execpath = [execpath pathsep() fullfile(dirs{end}, "bin")]; endif endif
--- a/scripts/pkg/private/uninstall.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/private/uninstall.m Tue Aug 14 11:17:26 2018 -0700 @@ -110,17 +110,17 @@ ## Do the actual deletion. if (desc.loaded) rmpath (desc.dir); - if (exist (getarchdir (desc))) + if (isfolder (getarchdir (desc))) rmpath (getarchdir (desc)); endif endif - if (exist (desc.dir, "dir")) + if (isfolder (desc.dir)) [status, msg] = rmdir (desc.dir, "s"); - if (status != 1 && exist (desc.dir, "dir")) + if (status != 1 && isfolder (desc.dir)) error ("couldn't delete directory %s: %s", desc.dir, msg); endif [status, msg] = rmdir (getarchdir (desc), "s"); - if (status != 1 && exist (getarchdir (desc), "dir")) + if (status != 1 && isfolder (getarchdir (desc))) error ("couldn't delete directory %s: %s", getarchdir (desc), msg); endif if (dirempty (desc.archprefix))
--- a/scripts/pkg/private/unload_packages.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/pkg/private/unload_packages.m Tue Aug 14 11:17:26 2018 -0700 @@ -54,7 +54,7 @@ archdirs = {}; for i = 1:length (dirs) tmpdir = getarchdir (desc{i}); - if (exist (tmpdir, "dir")) + if (isfolder (tmpdir)) archdirs{end+1} = dirs{i}; archdirs{end+1} = tmpdir; else
--- a/scripts/plot/util/print.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/plot/util/print.m Tue Aug 14 11:17:26 2018 -0700 @@ -326,7 +326,7 @@ opts = __print_parse_opts__ (varargin{:}); folder = fileparts (opts.name); - if (! isempty (folder) && ! exist (folder, "dir")) + if (! isempty (folder) && ! isfolder (folder)) error ("print: directory %s does not exist", folder); endif
--- a/scripts/prefs/getpref.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/prefs/getpref.m Tue Aug 14 11:17:26 2018 -0700 @@ -145,7 +145,7 @@ %! %! unwind_protect_cleanup %! unlink (fullfile (tmp_home, ".octave_prefs")); -%! if (exist (tmp_home, "dir")) +%! if (isfolder (tmp_home)) %! rmdir (tmp_home); %! endif %! if (isempty (HOME))
--- a/scripts/prefs/prefdir.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/prefs/prefdir.m Tue Aug 14 11:17:26 2018 -0700 @@ -48,7 +48,7 @@ dir = get_home_directory (); if (nargin > 0) - if (! exist (dir, "dir")) + if (! isfolder (dir)) mkdir (dir); endif endif
--- a/scripts/prefs/setpref.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/prefs/setpref.m Tue Aug 14 11:17:26 2018 -0700 @@ -91,7 +91,7 @@ %! "size mismatch for PREF and VAL"); %! unwind_protect_cleanup %! unlink (fullfile (tmp_home, ".octave_prefs")); -%! if (exist (tmp_home, "dir")) +%! if (isfolder (tmp_home)) %! rmdir (tmp_home); %! endif %! if (isempty (HOME))
--- a/scripts/profiler/profexport.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/profiler/profexport.m Tue Aug 14 11:17:26 2018 -0700 @@ -64,7 +64,7 @@ endif endif - if (! exist (dir, "dir")) + if (! isfolder (dir)) ok = mkdir (dir); if (! ok) error ("profexport: failed to create output directory '%s'", dir);
--- a/scripts/testfun/private/dump_demos.m Tue Aug 14 09:35:13 2018 -0700 +++ b/scripts/testfun/private/dump_demos.m Tue Aug 14 11:17:26 2018 -0700 @@ -93,7 +93,7 @@ if (! is_absolute_filename (d)) d = dir_in_loadpath (d); endif - if (! exist (d, "dir")) + if (! isfolder (d)) error ("dump_demos: directory %s does not exist", d); endif dump_all_demos (d, fid, fmt);