diff options
| author | Volker Uhrig | 2008-08-11 01:06:20 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-08-11 01:06:20 +0200 |
| commit | c649e1f4646f73fe898e37b65e83f143631f0dd7 (patch) | |
| tree | a2c142b50a19b0d8f4fd2e07d3a673cd3d839ff5 /os-plugins | |
| parent | Add an option to use ddcinfo for display/monitor setup. In some (diff) | |
| download | core-c649e1f4646f73fe898e37b65e83f143631f0dd7.tar.gz core-c649e1f4646f73fe898e37b65e83f143631f0dd7.tar.xz core-c649e1f4646f73fe898e37b65e83f143631f0dd7.zip | |
* Fix wrong test condition which worked fine under SuSE
* Minor fix
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2022 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 2 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/install-vmpl.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index 269af04e..52ac6d4d 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -256,7 +256,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \ elif [ "${vmware_kind}" = "vmpl2.0" ]; then echo "vmplversion=2" > /mnt/etc/vmware/version elif [ "${vmware_kind}" = "local" ]; then - version=$(strings /usr/lib/vmware/bin/vmplayer|head -n 1|cut -c 1) + version=$(strings /mnt/usr/lib/vmware/bin/vmplayer|head -n 1|cut -c 1) echo "vmplversion=${version}" > /mnt/etc/vmware/version fi diff --git a/os-plugins/plugins/vmware/files/install-vmpl.sh b/os-plugins/plugins/vmware/files/install-vmpl.sh index 0708de8c..cc47e58d 100644 --- a/os-plugins/plugins/vmware/files/install-vmpl.sh +++ b/os-plugins/plugins/vmware/files/install-vmpl.sh @@ -3,7 +3,7 @@ cd /opt/openslx/plugin-repo/vmware/ ### Check if player are still installed -if [ -d vmroot/ ]; then +if [ -d ${1}/vmroot/ ]; then echo " * $1 seems to be installed. There shouldn't be a need for a new installation." echo " If you want to reinstall $1 press \"y\" else we will exit" read @@ -16,10 +16,10 @@ fi ### Now define values -if [ "$1" == "vmpl1.0" ]; then +if [ "$1" = "vmpl1.0" ]; then vmplversion="vmpl1.0" tgzfile=$(ls packages/VMware-player-1.0.*|sort|tail -n 1) -elif [ "$1" == "vmpl2.0" ]; then +elif [ "$1" = "vmpl2.0" ]; then vmplversion="vmpl2.0" tgzfile=$(ls packages/VMware-player-2.0.*|sort|tail -n 1) else |