Mercurial > hg > octave-nkf
changeset 14472:045a5b85495d
maint: Remove redundant private function from the package manager.
* scripts/pkg/private/issuperuser.m: remove file.
* scripts/pkg/pkg.m: remove call to issuperuser.
* scripts/pkg/private/getarchprefix.m: remove call to issuperuser.
* scripts/pkg/private/create_pkgaddel.m: remove call to issuperuser.
author | Carlo de Falco <kingcrimson@tiscali.it> |
---|---|
date | Fri, 16 Mar 2012 21:14:49 +0100 |
parents | d2c095e45196 |
children | a46b8b0bd325 |
files | scripts/pkg/pkg.m scripts/pkg/private/getarchprefix.m scripts/pkg/private/issuperuser.m |
diffstat | 3 files changed, 5 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/pkg/pkg.m +++ b/scripts/pkg/pkg.m @@ -273,7 +273,9 @@ mlock (); - global_install = issuperuser (); + ## If user is superuser set global_istall to true + ## FIXME: is it OK to set this always true on windows? + global_install = ((ispc () && ! isunix ()) || (geteuid () == 0)); if (prefix == -1) if (global_install)
--- a/scripts/pkg/private/getarchprefix.m +++ b/scripts/pkg/private/getarchprefix.m @@ -24,9 +24,9 @@ ## @end deftypefn function archprefix = getarchprefix (desc, global_install) - if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) + if (global_install) archprefix = fullfile (octave_config_info ("libdir"), "octave", - "packages", cstrcat(desc.name, "-", desc.version)); + "packages", cstrcat (desc.name, "-", desc.version)); else archprefix = desc.dir; endif
deleted file mode 100644 --- a/scripts/pkg/private/issuperuser.m +++ /dev/null @@ -1,32 +0,0 @@ -## Copyright (C) 2005-2012 S�ren Hauberg -## Copyright (C) 2010 VZLU Prague, a.s. -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -## -*- texinfo -*- -## @deftypefn {Function File} {@var{s} =} issuperuser () -## Undocumented internal function. -## @end deftypefn - -function s = issuperuser () - if ((ispc () && ! isunix ()) || (geteuid() == 0)) - s = true; - else - s = false; - endif -endfunction -