diff options
| author | Volker Uhrig | 2008-05-24 17:02:14 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-05-24 17:02:14 +0200 |
| commit | 572ed17f62cc2c595fa1134abd665873ed1fbff7 (patch) | |
| tree | 1284bec63b69775493bc285bcc95225b25187b83 /os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | |
| parent | * added checking of system attributes, too (before only clients were checked) (diff) | |
| download | core-572ed17f62cc2c595fa1134abd665873ed1fbff7.tar.gz core-572ed17f62cc2c595fa1134abd665873ed1fbff7.tar.xz core-572ed17f62cc2c595fa1134abd665873ed1fbff7.zip | |
* fixed problems with local installed version raised through vmpl2.0
integration. local should work now. at least it passed tests with
suse 10.2
* integration with vmchooser is still missing on side of vmchooser
plugin. You can use it with a proper formed xml file:
/var/X11R6/bin/run/run-vmware.sh /path/to/xml/xmlfile.xml
* vmpl2.0 isn't usable yet.
* small bugfixes and nicer output of runvmware
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1793 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm')
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index ac2281e4..4f22a66a 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -261,17 +261,24 @@ sub _writeWrapperScript #!/bin/sh # written by OpenSLX-plugin 'vmware' in Stage1 # radically simplified version of the original script $file by VMware Inc. - #TODO: test it with local installed vmplayer!!! - export LD_LIBRARY_PATH=$vmpath/lib - export GTK_PIXBUF_MODULE_FILE=$vmpath/libconf/etc/gtk-2.0/gdk-pixbuf.loaders - export GTK_IM_MODULE_FILE=$vmpath/libconf/etc/gtk-2.0/gtk.immodules - export FONTCONFIG_PATH=$vmpath/libconf/etc/fonts - export PANGO_RC_FILE=$vmpath/libconf/etc/pango/pangorc - # possible needed... but what are they good for? - #export GTK_DATA_PREFIX= - #export GTK_EXE_PREFIX= - #export GTK_PATH= + End-of-Here + + # kinda ugly and we only need it for local. Preserves errors + if ($kind ne "local") { + $script .= unshiftHereDoc(<<" End-of-Here"); + export LD_LIBRARY_PATH=$vmpath/lib + export GTK_PIXBUF_MODULE_FILE=$vmpath/libconf/etc/gtk-2.0/gdk-pixbuf.loaders + export GTK_IM_MODULE_FILE=$vmpath/libconf/etc/gtk-2.0/gtk.immodules + export FONTCONFIG_PATH=$vmpath/libconf/etc/fonts + export PANGO_RC_FILE=$vmpath/libconf/etc/pango/pangorc + # possible needed... but what are they good for? + #export GTK_DATA_PREFIX= + #export GTK_EXE_PREFIX= + #export GTK_PATH= + End-of-Here + } + $script .= unshiftHereDoc(<<" End-of-Here"); PREFIX=$vmpath # depends on the vmware location exec "\$PREFIX"'/lib/wrapper-gtk24.sh' \\ "\$PREFIX"'/lib' \\ |