* written in wrong file and removed deprecated install scripts

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1896 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 11 insertions, 245 deletions

diff --git a/os-plugins/plugins/vmware/files/install-vmpl.sh b/os-plugins/plugins/vmware/files/install-vmpl.sh
index 473bb507..6557aaf8 100644
--- a/os-plugins/plugins/vmware/files/install-vmpl.sh
+++ b/os-plugins/plugins/vmware/files/install-vmpl.sh
@@ -1,7 +1,14 @@
 #!/bin/sh
 
-vmplversion="vmpl1.0"
-url=http://download3.vmware.com/software/vmplayer/VMware-player-2.0.4-93057.i386.tar.gz
+if [ $1 = "vmpl1.0" ]; then
+    vmplversion="vmpl1.0"
+    url=http://download3.vmware.com/software/vmplayer/VMware-player-2.0.4-93057.i386.tar.gz
+    tgzfile=VMware-player-2.0.4-93057.i386.tar.gz
+else if [ $1 = "vmpl2.0" ]; then
+    vmplversion="vmpl2.0"
+    url=http://download3.vmware.com/software/vmplayer/VMware-player-2.0.4-93057.i386.tar.gz
+    tgzfile=VMware-player-2.0.4-93057.i386.tar.gz
+fi
 
 echo "This script will download and install vmplayer from http://www.vmware.com/"
 echo "Please go to http://vmware.com/download/player/player_reg.html"
@@ -23,8 +30,8 @@ if [ "${REPLY}" == "YES" ]; then
     cd /opt/openslx/plugin-repo/vmware/${vmplversion}
     wget -c ${url}
 
-    echo "   * Unpacking vmplayer"
-    tar xfz VMware-player-2.0.4-93057.i386.tar.gz
+    echo "   * Unpacking vmplayer $vmpl{version}"
+    tar xfz ${tgzfile}
 
     # reduce some errors
     echo "   * deleting old files if available"
@@ -32,7 +39,6 @@ if [ "${REPLY}" == "YES" ]; then
 
     echo "   * copying files..."
     mkdir vmroot
-    mkdir -p vmroot/modules
     mkdir -p vmroot/lib
     mv vmware-player-distrib/lib vmroot/lib/vmware
     mv vmware-player-distrib/bin vmroot/
@@ -50,9 +56,6 @@ if [ "${REPLY}" == "YES" ]; then
     mv test/lib*/* .
     cd ../../../..
 
-    echo "   * Fixing file permission"
-    chmod 04555 vmroot/lib/vmware/bin/vmware-vmx
-
     echo "   * fixing gdk and pango config files"
     sed -i \
       's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/${vmplversion}/vmroot/lib/vmware/libconf,' \
@@ -88,24 +91,18 @@ if [ "${REPLY}" == "YES" ]; then
     # TODO: error check if build environment isn't installed...
     sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
     make -s
-    cp vmblock.ko ../../../../../../modules
-    cp vmblock.o ../../../../../../modules
     cd ..
 
     echo "   * building vmmon module"
     cd vmmon-only
     sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
     make -s
-    cp vmmon.ko ../../../../../../modules
-    cp vmmon.o ../../../../../../modules
     cd ..
     
     echo "   * building vmnet module"
     cd vmnet-only
     sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
     make -s
-    cp vmnet.ko ../../../../../../modules
-    cp vmnet.o ../../../../../../modules
     cd ../../../../../..
         
     echo "   * setting up EULA"
diff --git a/os-plugins/plugins/vmware/files/install-vmpl1.0.sh b/os-plugins/plugins/vmware/files/install-vmpl1.0.sh
deleted file mode 100644
index 6557aaf8..00000000
--- a/os-plugins/plugins/vmware/files/install-vmpl1.0.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-if [ $1 = "vmpl1.0" ]; then
-    vmplversion="vmpl1.0"
-    url=http://download3.vmware.com/software/vmplayer/VMware-player-2.0.4-93057.i386.tar.gz
-    tgzfile=VMware-player-2.0.4-93057.i386.tar.gz
-else if [ $1 = "vmpl2.0" ]; then
-    vmplversion="vmpl2.0"
-    url=http://download3.vmware.com/software/vmplayer/VMware-player-2.0.4-93057.i386.tar.gz
-    tgzfile=VMware-player-2.0.4-93057.i386.tar.gz
-fi
-
-echo "This script will download and install vmplayer from http://www.vmware.com/"
-echo "Please go to http://vmware.com/download/player/player_reg.html"
-echo "and ..."
-echo "   * complete this registration form"
-echo "   * click on \"Download Now\""
-echo "   * read and decide if you want to accept the VMware master end user license agreement"
-echo
-echo "If you have done this and accepted the enduser licence type in yes in uppercase."
-echo "This will install vmplayer on your vendor-os. If you don't agree this license"
-echo "vmplayer won't be installed."
-echo
-read
-echo 
-
-if [ "${REPLY}" == "YES" ]; then
-
-    echo "   * Downloading vmplayer as ${vmplversion} now. This may take a while"
-    cd /opt/openslx/plugin-repo/vmware/${vmplversion}
-    wget -c ${url}
-
-    echo "   * Unpacking vmplayer $vmpl{version}"
-    tar xfz ${tgzfile}
-
-    # reduce some errors
-    echo "   * deleting old files if available"
-    rm -rf vmroot
-
-    echo "   * copying files..."
-    mkdir vmroot
-    mkdir -p vmroot/lib
-    mv vmware-player-distrib/lib vmroot/lib/vmware
-    mv vmware-player-distrib/bin vmroot/
-    mv vmware-player-distrib/sbin vmroot/
-    mv vmware-player-distrib/doc vmroot/
-    rm -rf vmware-player-distrib/
-
-    # I don't want to understand what vmware is doing, but without this
-    # step we need to have LD_LIBRARY_PATH with 53 entrys. welcome to
-    # library hell
-    echo "   * fixing librarys..."
-    cd vmroot/lib/vmware/lib
-    mkdir test
-    mv lib* test
-    mv test/lib*/* .
-    cd ../../../..
-
-    echo "   * fixing gdk and pango config files"
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/${vmplversion}/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/gtk-2.0/gdk-pixbuf.loaders
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/${vmplversion}/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/gtk-2.0/gtk.immodules
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/${vmplversion}/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/pango/pango.modules
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/${vmplversion}/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/pango/pangorc
-    sed -i \
-      's,/etc/pango/pango/,/etc/pango/,' \
-      vmroot/lib/vmware/libconf/etc/pango/pangorc
-
-    echo "   * creating /etc/vmware"
-    mkdir -p /etc/vmware
-
-    echo "   * unpacking kernel modules"
-    cd vmroot/lib/vmware/modules/source
-    tar xf vmnet.tar
-    tar xf vmmon.tar
-    tar xf vmblock.tar
-
-    echo "   * building vmblock module"
-    cd vmblock-only/
-    # TODO: check if /boot/vmlinuz is available if we get the kernel version this way
-    #       perhaps we don't need a check... perhaps openslx always use
-    #       /boot/vmlinuz
-    #       This problem happens 3 times. see below!
-    # TODO: error check if build environment isn't installed...
-    sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
-    make -s
-    cd ..
-
-    echo "   * building vmmon module"
-    cd vmmon-only
-    sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
-    make -s
-    cd ..
-    
-    echo "   * building vmnet module"
-    cd vmnet-only
-    sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
-    make -s
-    cd ../../../../../..
-        
-    echo "   * setting up EULA"
-    mv vmroot/doc/EULA vmroot/lib/vmware/share/EULA.txt
-
-    # TODO: remove. just for debug reasons
-    #echo "Press any return to process"
-    #read
-
-    echo "   * finishing installation"
-
-else
-    echo "You didnt't accept the end user license. vmplayer is not installed."
-fi
diff --git a/os-plugins/plugins/vmware/files/install-vmpl2.0.sh b/os-plugins/plugins/vmware/files/install-vmpl2.0.sh
deleted file mode 100644
index a0776ac8..00000000
--- a/os-plugins/plugins/vmware/files/install-vmpl2.0.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-echo "This script will download and install vmplayer from http://www.vmware.com/"
-echo "Please go to http://vmware.com/download/player/player_reg.html"
-echo "and ..."
-echo "   * complete this registration form"
-echo "   * click on \"Download Now\""
-echo "   * read and decide if you want to accept the VMware master end user license agreement"
-echo
-echo "If you have done this and accepted the enduser licence type in yes in uppercase."
-echo "This will install vmplayer on your vendor-os. If you don't agree this license"
-echo "vmplayer won't be installed."
-echo
-read
-echo 
-
-if [ "${REPLY}" == "YES" ]; then
-
-    echo "   * Downloading vmplayer now. This may take a while"
-    cd /opt/openslx/plugin-repo/vmware/vmpl2.0
-    wget -q -c http://download3.vmware.com/software/vmplayer/VMware-player-2.0.2-59824.i386.tar.gz
-
-    echo "   * Unpacking vmplayer"
-    tar xfz VMware-player-2.0.2-59824.i386.tar.gz
-
-    #reduce some errors
-    echo "   * removeing old files"
-    rm -rf vmroot
-
-    echo "   * copying files..."
-    mkdir vmroot
-    mkdir -p vmroot/lib
-    mv vmware-player-distrib/lib vmroot/lib/vmware
-    mv vmware-player-distrib/bin vmroot/
-    mv vmware-player-distrib/sbin vmroot/
-    mv vmware-player-distrib/doc vmroot/
-    rm -rf vmware-player-distrib/
-
-    # I don't want to understand what vmware is doing, but without this
-    # step we need to have LD_LIBRARY_PATH with 53 entrys. welcome to
-    # library hell
-    echo "   * fixing librarys..."
-    cd vmroot/lib/vmware/lib
-    mkdir test
-    mv lib* test
-    mv test/lib*/* .
-    cd ../../../..
-
-    echo "   * changing file permission"
-    chmod 04555 vmroot/lib/vmware/bin/vmware-vmx
-
-    echo "   * fixing gdk and pango config files"
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/vmpl2.0/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/gtk-2.0/gdk-pixbuf.loaders
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/vmpl2.0/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/gtk-2.0/gtk.immodules
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/vmpl2.0/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/pango/pango.modules
-    sed -i \
-      's,/build/mts/.*/vmui/../libdir/libconf,/opt/openslx/plugin-repo/vmware/vmpl2.0/vmroot/lib/vmware/libconf,' \
-      vmroot/lib/vmware/libconf/etc/pango/pangorc
-    sed -i \
-      's,/etc/pango/pango/,/etc/pango/,' \
-      vmroot/lib/vmware/libconf/etc/pango/pangorc
-
-    echo "   * creating /etc/vmware"
-    mkdir -p /etc/vmware
-
-    echo "   * unpacking kernel modules"
-    cd vmroot/lib/vmware/modules/source
-    tar xf vmnet.tar
-    tar xf vmmon.tar
-    tar xf vmblock.tar
-
-    echo "   * building vmblock module"
-    cd vmblock-only/
-    # TODO: check if /boot/vmlinuz is available if we get the kernel version this way
-    #       perhaps we don't need a check... perhaps openslx always use
-    #       /boot/vmlinuz
-    #       This problem happens 3 times. see below!
-    # TODO: error check if build environment isn't installed...
-    sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
-    make -s
-    cd ..
-
-    echo "   * building vmmon module"
-    cd vmmon-only
-    sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
-    make -s
-    cd ..
-    
-    echo "   * building vmnet module"
-    cd vmnet-only
-    sed -i "s%^VM_UNAME = .*%VM_UNAME = $(ls /boot/vmlinuz*|grep -v -e "^/boot/vmlinuz$$"|sed 's,/boot/vmlinuz-,,'|sort|tail -n 1)%" Makefile
-    make -s
-    cd ../../../../../..
-        
-    echo "   * setting up EULA"
-    mv vmroot/doc/EULA vmroot/lib/vmware/share/EULA.txt
-
-    # TODO: remove. just for debug reasons
-    #echo "Press any return to process"
-    #read
-
-    echo "   * finishing installation"
-
-else
-    echo "You didnt't accept the end user license. vmplayer is not installed."
-fi