- Finished upgrade to 3.2.10

[packages/VirtualBox-bin.git] / VirtualBox.sh

diff --git a/VirtualBox.sh b/VirtualBox.sh
index d974e06cf04b6ea2463ca594bcb75326903a6377..0babe570f4669370fe07fef1cdfc14f52362a8f5 100644 (file)
--- a/VirtualBox.sh
+++ b/VirtualBox.sh
@@ -1,26 +1,22 @@
 #!/bin/sh
 BINFILE=$(basename "$0")
-VBOXDIR=/usr/lib/VirtualBox
-[ ! -d "$VBOXDIR" ] && VBOXDIR=/usr/lib64/VirtualBox
+VBOXDIR=@LIBDIR@/VirtualBox
 
 show_message() {
        if [ ! -z "$DISPLAY" ] && [ -x /usr/bin/gxmessage ]; then
-               local BAK=$IFS
-               IFS=""
-               gxmessage --center --buttons GTK_STOCK_OK -wrap -geometry 400x150 -name $BINFILE $(echo -e "$1")
-               IFS=$BAK
+               echo -e "$1" | gxmessage --center --buttons GTK_STOCK_OK -wrap -geometry 400x150 -name $BINFILE -file -
        else
                echo -e "$1"
        fi
 }
 
 if [ ! -d "$VBOXDIR" ]; then
-       show_message "Can't find VritualBox libraries! Can't continue!.\nCorrect this situation or contact with your system administrator."
+       show_message "Can't find VirtualBox libraries! Can't continue!.\nCorrect this situation or contact with your system administrator."
        exit 1
 fi
 
 if [ ! -c /dev/vboxdrv ]; then
-       show_message "Special character device /dev/vboxdrv doesn't exists!\nCheck your installation and if vboxdrv kernel module is loaded."
+       show_message "Special character device /dev/vboxdrv doesn't exists!\nCheck your installation and whether vboxdrv kernel module is loaded."
        exit 1
 fi
 
@@ -29,5 +25,7 @@ if [ ! -w /dev/vboxdrv ]; then
        exit 1
 fi
 
+[ "$BINFILE" = "VBoxVRDP" ] && BINFILE="VBoxHeadless"
+
 export LD_LIBRARY_PATH=$VBOXDIR
 exec $VBOXDIR/$BINFILE ${1:+"$@"}