diff options
author | ramon <ramongomez@us.es> | 2011-10-17 08:58:49 +0000 |
---|---|---|
committer | ramon <ramongomez@us.es> | 2011-10-17 08:58:49 +0000 |
commit | e4dafd64d9c6df68d0067b8b171af4f5c8b04403 (patch) | |
tree | 3d62a4fc5d1f926b4fa67b298551c241513904b8 /client/engine/Inventory.lib | |
parent | fa4129cd964296276dcc37360e6252809d738a79 (diff) |
VersiĆ³n 1.0.2: continuar revisando variables locales y ayudas de las funciones del motor de clonaciĆ³n (modifica #446).
git-svn-id: https://opengnsys.es/svn/branches/version1.0@2347 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/engine/Inventory.lib')
-rwxr-xr-x | client/engine/Inventory.lib | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/client/engine/Inventory.lib b/client/engine/Inventory.lib index 41185c21..c0d825c8 100755 --- a/client/engine/Inventory.lib +++ b/client/engine/Inventory.lib @@ -17,8 +17,14 @@ #@author Ramon Gomez, ETSII Universidad de Sevilla #@date 2010-07-17 #*/ -function ogGetArch () { -[ -d /lib64 ] && echo x86_64 || echo i386 +function ogGetArch () +{ +if [ "$*" == "help" ]; then + ogHelp "$FUNCNAME" "$FUNCNAME" "$FUNCNAME => x86_64" + return +fi + +[ -d /lib64 ] && echo "x86_64" || echo "i386" } @@ -41,10 +47,10 @@ function ogGetOsVersion () { # Variables locales. local MNTDIR TYPE DISTRIB VERSION FILE - # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then - ogHelp "$FUNCNAME" "$FUNCNAME" + ogHelp "$FUNCNAME" "$FUNCNAME int_ndisk int_npartition" \ + "$FUNCNAME 1 2 => Linux:Ubuntu 11.04 64 bits" return fi # Error si no se reciben 2 parametros. @@ -96,6 +102,12 @@ return 0 #*/ ## function ogGetOsType () { +# Si se solicita, mostrar ayuda. +if [ "$*" == "help" ]; then + ogHelp "$FUNCNAME" "$FUNCNAME int_ndisk int_npartition" \ + "$FUNCNAME 1 2 => Linux" + return +fi ogGetOsVersion "$@" | cut -sf1 -d: } @@ -168,7 +180,7 @@ lshw | awk 'BEGIN {type="mod";} function ogListSoftware () { # Variables locales. -local MNTDIR TYPE DPKGDIR RPMDIR KEYS KEYS32 k PROG VERS +local MNTDIR TYPE DPKGDIR RPMDIR PACMANDIR KEYS KEYS32 k PROG VERS # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then @@ -258,7 +270,9 @@ esac #@attention #@version 0.1 Date: 27/10/2008 Author Antonio J. Doblas Viso. Universidad de Malaga #*/ -function ogInfoCache () { +function ogInfoCache () +{ +local info infoFilesystem infoSize infoUsed infoUsedPorcet infoMountedOn content if ogMountCache then info=`df -h | grep $OGCAC` @@ -290,3 +304,4 @@ else fi } + |