From b6dce2ccb872702636ea81a4e69ea79de81b32a3 Mon Sep 17 00:00:00 2001
From: Volker Uhrig
Date: Thu, 10 Jul 2008 17:00:38 +0000
Subject: * fixed vmbuild version check

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1918 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmware/files/runvmware-player-v1 | 8 +++++---
 os-plugins/plugins/vmware/files/runvmware-player-v2 | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v1 b/os-plugins/plugins/vmware/files/runvmware-player-v1
index e41dfcb5..ee170064 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v1
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v1
@@ -516,9 +516,11 @@ filecheck
 # VMPlayer Version.
 # strings is the fastest and most secure way, vmplayer -v takes too much time
 # and resources
-vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \
-    | grep -m 1 "build-"|sed 's/.*build-//')
-if [ ! -n ${vmbuild} ]; then
+# TODO: find a solution which is faster... handeling different installed
+#       vmplversions
+#vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \
+#    | grep -m 1 "build-"|sed 's/.*build-//')
+if [ -z ${vmbuild} ]; then
   vmbuild=$(vmplayer -v | sed 's/.*build-//')
 fi
 
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2
index e41dfcb5..b9391f05 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v2
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v2
@@ -516,9 +516,11 @@ filecheck
 # VMPlayer Version.
 # strings is the fastest and most secure way, vmplayer -v takes too much time
 # and resources
-vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \
-    | grep -m 1 "build-"|sed 's/.*build-//')
-if [ ! -n ${vmbuild} ]; then
+# TODO: fine a faster solution with different installed vmplayer
+#       perhaps via stage1 + /etc/vmware/vmversion
+#vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \
+#    | grep -m 1 "build-"|sed 's/.*build-//')
+if [ -z ${vmbuild} ]; then
   vmbuild=$(vmplayer -v | sed 's/.*build-//')
 fi
 
-- 
cgit v1.2.3-55-g7522