VirtualBox

Changeset 37255 in vbox for trunk/src/VBox


Ignore:
Timestamp:
May 30, 2011 12:35:45 PM (14 years ago)
Author:
vboxsync
Message:

Installer/linux+solaris: clean up VBox.sh

Location:
trunk/src/VBox
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/solaris/Installer/VBox.sh

    r33656 r37255  
    33# VirtualBox startup script for Solaris Guests Additions
    44#
    5 # Copyright (C) 2008-2010 Oracle Corporation
     5# Copyright (C) 2008-2011 Oracle Corporation
    66#
    77# This file is part of VirtualBox Open Source Edition (OSE), as
     
    2323#
    2424
    25 CPUTYPE=`isainfo -k`
    26 ISADIR=""
    27 if test "$CPUTYPE" = "amd64"; then
    28     ISADIR="amd64"
     25CURRENT_ISA=`isainfo -k`
     26if test "$CURRENT_ISA" = "amd64"; then
     27    INSTALL_DIR="/opt/VirtualBoxAdditions/amd64"
     28else
     29    INSTALL_DIR="/opt/VirtualBoxAdditions"
    2930fi
    3031
    31 INSTALL_DIR="/opt/VirtualBoxAdditions"
    32 APP=`which $0`
    33 APP=`basename $APP`
     32APP=`basename $0`
    3433case "$APP" in
    35   VBoxClient)
    36     exec "$INSTALL_DIR/$ISADIR/VBoxClient" "$@"
    37   ;;
    38   VBoxService)
    39     exec "$INSTALL_DIR/$ISADIR/VBoxService" "$@"
    40   ;;
    41   VBoxControl)
    42     exec "$INSTALL_DIR/$ISADIR/VBoxControl" "$@"
    43   ;;
    44   *)
    45     echo "Unknown application - $APP"
    46   ;;
     34    VBoxClient)
     35        exec "$INSTALL_DIR/VBoxClient" "$@"
     36        ;;
     37    VBoxService)
     38        exec "$INSTALL_DIR/VBoxService" "$@"
     39        ;;
     40    VBoxControl)
     41        exec "$INSTALL_DIR/VBoxControl" "$@"
     42        ;;
     43    *)
     44        echo "Unknown application - $APP"
     45        exit 1
     46        ;;
    4747esac
    48 
     48exit 0
  • trunk/src/VBox/Installer/linux/VBox.sh

    r36782 r37255  
    11#!/bin/sh
    22#
    3 # Oracle VM VirtualBox
     3# Oracle VM VirtualBox startup script, Linux hosts.
    44#
    5 # Copyright (C) 2006-2010 Oracle Corporation
     5# Copyright (C) 2006-2011 Oracle Corporation
    66#
    77# This file is part of VirtualBox Open Source Edition (OSE), as
     
    7878fi
    7979
    80 APP=`which $0`
    81 APP=`basename $APP`
    82 APP=${APP##/*/}
     80APP=`basename $0`
    8381case "$APP" in
    84   VirtualBox|virtualbox)
    85     exec "$INSTALL_DIR/VirtualBox" "$@"
    86     ;;
    87   VBoxManage|vboxmanage)
    88     exec "$INSTALL_DIR/VBoxManage" "$@"
    89     ;;
    90   VBoxSDL|vboxsdl)
    91     exec "$INSTALL_DIR/VBoxSDL" "$@"
    92     ;;
    93   VBoxVRDP|VBoxHeadless|vboxheadless)
    94     exec "$INSTALL_DIR/VBoxHeadless" "$@"
    95     ;;
    96   VBoxBalloonCtrl|vboxballoonctrl)
    97     exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
    98     ;;
    99   vboxwebsrv)
    100     exec "$INSTALL_DIR/vboxwebsrv" "$@"
    101     ;;
    102   *)
    103     echo "Unknown application - $APP"
    104     ;;
     82    VirtualBox|virtualbox)
     83        exec "$INSTALL_DIR/VirtualBox" "$@"
     84        ;;
     85    VBoxManage|vboxmanage)
     86        exec "$INSTALL_DIR/VBoxManage" "$@"
     87        ;;
     88    VBoxSDL|vboxsdl)
     89        exec "$INSTALL_DIR/VBoxSDL" "$@"
     90        ;;
     91    VBoxVRDP|VBoxHeadless|vboxheadless)
     92        exec "$INSTALL_DIR/VBoxHeadless" "$@"
     93        ;;
     94    VBoxBalloonCtrl|vboxballoonctrl)
     95        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
     96        ;;
     97    vboxwebsrv)
     98        exec "$INSTALL_DIR/vboxwebsrv" "$@"
     99        ;;
     100    VBoxBFE|vboxbfe)
     101        exec "$INSTALL_DIR/VBoxBFE" "$@"
     102        ;;
     103    *)
     104        echo "Unknown application - $APP"
     105        exit 1
     106        ;;
    105107esac
     108exit 0
  • trunk/src/VBox/Installer/linux/debian/VBox.sh

    r36782 r37255  
    11#!/bin/sh
    22#
    3 # Oracle VM VirtualBox
     3# Oracle VM VirtualBox startup script, Linux hosts.
    44#
    55# Copyright (C) 2006-2011 Oracle Corporation
     
    7070fi
    7171
    72 APP=`which $0`
    73 APP=`basename $APP`
    74 APP=${APP##/*/}
     72INSTALL_DIR=/usr/lib/virtualbox
     73
     74APP=`basename $0`
    7575case "$APP" in
    76   VirtualBox|virtualbox)
    77     exec "/usr/lib/virtualbox/VirtualBox" "$@"
    78     ;;
    79   VBoxManage|vboxmanage)
    80     exec "/usr/lib/virtualbox/VBoxManage" "$@"
    81     ;;
    82   VBoxSDL|vboxsdl)
    83     exec "/usr/lib/virtualbox/VBoxSDL" "$@"
    84     ;;
    85   VBoxVRDP|VBoxHeadless|vboxheadless)
    86     exec "/usr/lib/virtualbox/VBoxHeadless" "$@"
    87     ;;
    88   VBoxBalloonCtrl|vboxballoonctrl)
    89     exec "/usr/lib/virtualbox/VBoxBalloonCtrl" "$@"
    90     ;;
    91   vboxwebsrv)
    92     exec "/usr/lib/virtualbox/vboxwebsrv" "$@"
    93     ;;
    94   *)
    95     echo "Unknown application - $APP"
    96     ;;
     76    VirtualBox|virtualbox)
     77        exec "$INSTALL_DIR/VirtualBox" "$@"
     78        ;;
     79    VBoxManage|vboxmanage)
     80        exec "$INSTALL_DIR/VBoxManage" "$@"
     81        ;;
     82    VBoxSDL|vboxsdl)
     83        exec "$INSTALL_DIR/VBoxSDL" "$@"
     84        ;;
     85    VBoxVRDP|VBoxHeadless|vboxheadless)
     86        exec "$INSTALL_DIR/VBoxHeadless" "$@"
     87        ;;
     88    VBoxBalloonCtrl|vboxballoonctrl)
     89        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
     90        ;;
     91    vboxwebsrv)
     92        exec "$INSTALL_DIR/vboxwebsrv" "$@"
     93        ;;
     94    VBoxBFE|vboxbfe)
     95        exec "$INSTALL_DIR/VBoxBFE" "$@"
     96        ;;
     97    *)
     98        echo "Unknown application - $APP"
     99        exit 1
     100        ;;
    97101esac
     102exit 0
  • trunk/src/VBox/Installer/solaris/VBox.sh

    r32388 r37255  
    11#!/bin/sh
    22#
    3 # VirtualBox startup script, Solaris hosts.
     3# Oracle VM VirtualBox startup script, Solaris hosts.
    44#
    5 # Copyright (C) 2007-2010 Oracle Corporation
     5# Copyright (C) 2006-2011 Oracle Corporation
    66#
    77# This file is part of VirtualBox Open Source Edition (OSE), as
     
    2020    INSTALL_DIR="/opt/VirtualBox/i386"
    2121fi
    22 APP=`which $0`
    23 APP=`basename $APP`
     22
     23APP=`basename $0`
    2424case "$APP" in
    25   VirtualBox)
    26     exec "$INSTALL_DIR/VirtualBox" "$@"
    27   ;;
    28   VBoxManage)
    29     exec "$INSTALL_DIR/VBoxManage" "$@"
    30   ;;
    31   VBoxSDL)
    32     exec "$INSTALL_DIR/VBoxSDL" "$@"
    33   ;;
    34   VBoxVRDP)
    35     exec "$INSTALL_DIR/VBoxHeadless" "$@"
    36   ;;
    37   VBoxHeadless)
    38     exec "$INSTALL_DIR/VBoxHeadless" "$@"
    39   ;;
    40   VBoxQtconfig)
    41     exec "$INSTALL_DIR/VBoxQtconfig" "$@"
    42   ;;
    43   VBoxBFE)
    44     exec "$INSTALL_DIR/VBoxBFE" "$@"
    45   ;;
    46   *)
    47     echo "Unknown application - $APP"
    48   ;;
     25    VirtualBox|virtualbox)
     26        exec "$INSTALL_DIR/VirtualBox" "$@"
     27        ;;
     28    VBoxManage|vboxmanage)
     29        exec "$INSTALL_DIR/VBoxManage" "$@"
     30        ;;
     31    VBoxSDL|vboxsdl)
     32        exec "$INSTALL_DIR/VBoxSDL" "$@"
     33        ;;
     34    VBoxVRDP|VBoxHeadless|vboxheadless)
     35        exec "$INSTALL_DIR/VBoxHeadless" "$@"
     36        ;;
     37    VBoxBalloonCtrl|vboxballoonctrl)
     38        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
     39        ;;
     40    vboxwebsrv)
     41        exec "$INSTALL_DIR/vboxwebsrv" "$@"
     42        ;;
     43    VBoxBFE|vboxbfe)
     44        exec "$INSTALL_DIR/VBoxBFE" "$@"
     45        ;;
     46    VBoxQtconfig)
     47        exec "$INSTALL_DIR/VBoxQtconfig" "$@"
     48        ;;
     49    *)
     50        echo "Unknown application - $APP"
     51        exit 1
     52        ;;
    4953esac
    50 
     54exit 0
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette