diff options
| author | ramon <ramongomez@us.es> | 2011-09-23 09:59:18 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2011-09-23 09:59:18 +0000 |
| commit | 180f43e331508eef411656a34502813e5e464bdb (patch) | |
| tree | e2f074296f940c7e7db1ef5bed7db37434e0f7d4 /client/engine/Inventory.lib | |
| parent | 1616b6ece0d820b587b18e78046b9287cd227a7c (diff) | |
Versión 1.0.2: función {{{ogListSoftware}}} de programas de 32 bits en Windows de 64 bits.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@2315 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/engine/Inventory.lib')
| -rwxr-xr-x | client/engine/Inventory.lib | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/client/engine/Inventory.lib b/client/engine/Inventory.lib index 47ffd83d..41185c21 100755 --- a/client/engine/Inventory.lib +++ b/client/engine/Inventory.lib @@ -168,7 +168,7 @@ lshw | awk 'BEGIN {type="mod";} function ogListSoftware () { # Variables locales. -local MNTDIR TYPE DPKGDIR RPMDIR KEYS k PROG VERS +local MNTDIR TYPE DPKGDIR RPMDIR KEYS KEYS32 k PROG VERS # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then @@ -228,6 +228,7 @@ case "$TYPE" in NTFS|HNTFS|FAT32|HFAT32) # Claves de registro para programas instalados: formato "{clave}". KEYS=$(ogListRegistryKeys $MNTDIR software '\Microsoft\Windows\CurrentVersion\Uninstall') + KEYS32=$(ogListRegistryKeys $MNTDIR software '\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall') # Mostrar los valores "DisplayName" y "DisplayVersion" para cada clave. (for k in $KEYS; do PROG=$(ogGetRegistryValue $MNTDIR software "\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$k\\DisplayName") @@ -235,6 +236,13 @@ case "$TYPE" in VERS=$(ogGetRegistryValue $MNTDIR software "\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$k\\DisplayVersion") echo "$PROG $VERS" fi + done + for k in $KEYS32; do + PROG=$(ogGetRegistryValue $MNTDIR software "\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$k\\DisplayName") + if [ -n "$PROG" ]; then + VERS=$(ogGetRegistryValue $MNTDIR software "\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$k\\DisplayVersion") + echo "$PROG $VERS" + fi done) | sort | uniq ;; *) ogRaiseError $OG_ERR_PARTITION "$1, $2" |