Changeset 36658 in vbox for trunk/src/VBox/Installer

Timestamp:

Apr 12, 2011 3:40:51 PM (14 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: shell script refactoring

Location:

trunk/src/VBox/Installer/linux

Files:

• runasroot.sh (modified) (2 diffs)
• sh-utils.sh (copied) (copied from trunk/src/VBox/Installer/linux/runasroot.sh ) (2 diffs)

trunk/src/VBox/Installer/linux/runasroot.sh

@@ -1 +1 @@
 #!/bin/sh
+# $Id$
 ## @file
 # VirtualBox privileged execution helper script for Linux and Solaris
@@ -16 +17 @@
 #
 
-# Deal with differing "which" semantics
-mywhich() {
-    which "$1" 2>/dev/null | grep -v "no $1"
-}
-
-# Get the name and execute switch for a useful terminal emulator
-#
-# Sets $gxtpath to the emulator path or empty
-# Sets $gxttitle to the "title" switch for that emulator
-# Sets $gxtexec to the "execute" switch for that emulator
-# May clobber $gtx*
-# Calls mywhich
-getxterm() {
-    # gnome-terminal uses -e differently to other emulators
-    for gxti in "gnome-terminal --title -x" "konsole --title -e" "xterm -T -e"; do
-        set $gxti
-        gxtpath="`mywhich $1`"
-        case "$gxtpath" in ?*)
-            gxttitle=$2
-            gxtexec=$3
-            return
-            ;;
-        esac
-    done
-}
-
-# Quotes its argument by inserting '\' in front of every character save
-# for 'A-Za-z0-9/'.  Prints the result to stdout.
-quotify() {
-    echo $1 | sed -e 's/\([^a-zA-Z0-9/]\)/\\\1/g'
-}
+#include sh-utils.sh
 
 ostype=`uname -s`

trunk/src/VBox/Installer/linux/sh-utils.sh

@@ -1 @@
-#!/bin/sh
+# $Id$
+# Shell script include file
 ## @file
-# VirtualBox privileged execution helper script for Linux and Solaris
+# Shell script routines which are likely to be useful for different scripts
 #
 
@@ -45 +46 @@
 # for 'A-Za-z0-9/'.  Prints the result to stdout.
 quotify() {
-    echo $1 | sed -e 's/\([^a-zA-Z0-9/]\)/\\\1/g'
+    echo "$1" | sed -e 's/\([^a-zA-Z0-9/]\)/\\\1/g'
 }
-
-ostype=`uname -s`
-if test "$ostype" != "Linux" && test "$ostype" != "SunOS" ; then
-  echo "Linux/Solaris not detected."
-  exit 1
-fi
-
-case "$#" in "2"|"3")
-    ;;
-    *)
-    echo "Usage: `basename $0` DESCRIPTION COMMAND [ADVICE]" >&2
-    echo >&2
-    echo "Attempt to execute COMMAND with root privileges, displaying DESCRIPTION if" >&2
-    echo "possible and displaying ADVICE if possible if no su(1)-like tool is available." >&2
-    exit 1
-    ;;
-esac
-
-DESCRIPTION=$1
-COMMAND=$2
-ADVICE=$3
-PATH=$PATH:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/X11/bin
-
-case "$ostype" in SunOS)
-    PATH=$PATH:/usr/sfw/bin:/usr/gnu/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/openwin/bin:/usr/ucb
-    GKSU_SWITCHES="-au root"
-    ;;
-    *)
-    GKSU_SWITCHES=""
-    ;;
-esac
-
-case "$DISPLAY" in ?*)
-    KDESUDO="`mywhich kdesudo`"
-    case "$KDESUDO" in ?*)
-        eval "`quotify "$KDESUDO"` --comment `quotify "$DESCRIPTION"` -- $COMMAND"
-        exit
-        ;;
-    esac
-
-    GKSU="`mywhich gksu`"
-    case "$GKSU" in ?*)
-        # Older gksu does not grok --description nor '--' and multiple args.
-        # @todo which versions do?
-        # "$GKSU" --description "$DESCRIPTION" -- "$@"
-        # Note that $GKSU_SWITCHES is NOT quoted in the following
-        "$GKSU" $GKSU_SWITCHES "$COMMAND"
-        exit
-        ;;
-    esac
-    ;;
-esac # $DISPLAY
-
-# pkexec may work for ssh console sessions as well if the right agents
-# are installed.  However it is very generic and does not allow for any
-# custom messages.  Thus it comes after gksu.
-PKEXEC="`mywhich pkexec`"
-case "$PKEXEC" in ?*)
-    eval "\"$PKEXEC\" $COMMAND"
-    exit
-    ;;
-esac
-
-# The ultimate fallback is running 'su -' within an xterm.  We use the
-# title of the xterm to tell what is going on.
-case "$DISPLAY" in ?*)
-    SU="`mywhich su`"
-    case "$SU" in ?*)
-        getxterm
-        case "$gxtpath" in ?*)
-            "$gxtpath" "$gxttitle" "$DESCRIPTION - su" "$gxtexec" su - root -c "$COMMAND"
-            exit
-            ;;
-        esac
-    esac
-esac # $DISPLAY
-
-# Failure...
-case "$DISPLAY" in ?*)
-    echo "Unable to locate 'pkexec', 'gksu' or 'su+xterm'. $ADVICE" >&2
-    ;;
-    *)
-    echo "Unable to locate 'pkexec'. $ADVICE" >&2
-    ;;
-esac
-
-exit 1