Changeset 89160 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

May 19, 2021 12:46:33 PM (4 years ago)

Author:

vboxsync

Message:

Installer: Linux: Temporary add diagnostic logging to vboxdrv.sh (3) (to be reverted).

File:

• trunk/src/VBox/Installer/linux/vboxdrv.sh (modified) (1 diff)

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

@@ -157 +157 @@
 }
 
-# Detect VirtualBox version info or report error on error.
+# Detect VirtualBox version info or report error.
 VBOX_VERSION="$($VBOXMANAGE -v 2>/dev/null | cut -d r -f1)"
 VBOX_REVISION="r$($VBOXMANAGE -v 2>/dev/null | cut -d r -f2)"
-echo diagnostics: cut:  $(which cut) $([ -x $(which cut) ] && echo 1)
-echo diagnostics: VBOXMANAGE:  $VBOXMANAGE $([ -x "$VBOXMANAGE" ] && echo 1)
-echo diagnostics: VBOX_VERSION = .$VBOX_VERSION.
-echo diagnostics: VBOX_REVISION = .$VBOX_REVISION.
-if test -z "$VBOX_VERSION" -o "$VBOX_REVISION" = "r"; then
-    failure 'Cannot detect VirtualBox version'
-fi
+fail_msg "diagnostics: cut:  $(which cut) $([ -x $(which cut) ] && echo 1)"
+fail_msg "diagnostics: VBOXMANAGE:  $VBOXMANAGE $([ -x $VBOXMANAGE ] && echo 1)"
+fail_msg "diagnostics: VBOX_VERSION = .$VBOX_VERSION."
+fail_msg "diagnostics: VBOX_REVISION = .$VBOX_REVISION."
+[ -n "${VBOX_VERSION}" ] || failure 'Cannot detect VirtualBox version number'
+[ "${VBOX_REVISION}" != "r" ] || failure 'Cannot detect VirtualBox revision number'
 
 ## Output the vboxdrv part of our udev rule.  This is redirected to the right file.