Mercurial > hg > octave-lyh

comparison scripts/pkg/pkg.m @ 14214:2fe0f5fa8cc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace to-be-deprecated findstr occurrences with strfind. * help.m, textread.m, textscan.m, pkg.m, legend.m, __ezplot__.m, __go_draw_axes__.m, rundemos.m: Replace to-be-deprecated findstr occurrences with strfind.
author Rik <octave@nomad.inbox5.com>
date Wed, 18 Jan 2012 21:15:42 -0800
parents a022c04f68cc
children 7277fe922e99
comparison
equal deleted inserted replaced
14213:a022c04f68cc 14214:2fe0f5fa8cc3
2004 endif 2004 endif
2005 2005
2006 ## Now check if the package is loaded. 2006 ## Now check if the package is loaded.
2007 tmppath = strrep (path(), "\\", "/"); 2007 tmppath = strrep (path(), "\\", "/");
2008 for i = 1:length (installed_pkgs_lst) 2008 for i = 1:length (installed_pkgs_lst)
2009 if (findstr (tmppath, strrep (installed_pkgs_lst{i}.dir, "\\", "/"))) 2009 if (strfind (tmppath, strrep (installed_pkgs_lst{i}.dir, '\', '/')))
2010 installed_pkgs_lst{i}.loaded = true; 2010 installed_pkgs_lst{i}.loaded = true;
2011 else 2011 else
2012 installed_pkgs_lst{i}.loaded = false; 2012 installed_pkgs_lst{i}.loaded = false;
2013 endif 2013 endif
2014 endfor 2014 endfor
2015 for i = 1:length (local_packages) 2015 for i = 1:length (local_packages)
2016 if (findstr (tmppath, strrep (local_packages{i}.dir, "\\", "/"))) 2016 if (strfind (tmppath, strrep (local_packages{i}.dir, '\', '/')))
2017 local_packages{i}.loaded = true; 2017 local_packages{i}.loaded = true;
2018 else 2018 else
2019 local_packages{i}.loaded = false; 2019 local_packages{i}.loaded = false;
2020 endif 2020 endif
2021 endfor 2021 endfor
2022 for i = 1:length (global_packages) 2022 for i = 1:length (global_packages)
2023 if (findstr (tmppath, strrep (global_packages{i}.dir, "\\", "/"))) 2023 if (strfind (tmppath, strrep (global_packages{i}.dir, '\', '/')))
2024 global_packages{i}.loaded = true; 2024 global_packages{i}.loaded = true;
2025 else 2025 else
2026 global_packages{i}.loaded = false; 2026 global_packages{i}.loaded = false;
2027 endif 2027 endif
2028 endfor 2028 endfor
2396 isglob = true; 2396 isglob = true;
2397 ext(end) = []; 2397 ext(end) = [];
2398 else 2398 else
2399 isglob = false; 2399 isglob = false;
2400 endif 2400 endif
2401 pos = findstr (nm, ext); 2401 pos = strfind (nm, ext);
2402 if (pos) 2402 if (pos)
2403 if (! isglob && (length(nm) - pos(end) != length(ext) - 1)) 2403 if (! isglob && (length(nm) - pos(end) != length(ext) - 1))
2404 continue; 2404 continue;
2405 endif 2405 endif
2406 dep = true; 2406 dep = true;