VirtualBox builds: accept both sources of VirtualBox packages

- either package `virtualbox` (by Debian), or - package `virtualbox-6.1` (by virtualbox.org)
Whonix · Aug 14, 2021 · 2e9b99f · 2e9b99f
1 parent 288323a
commit 2e9b99f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/build-steps.d/1120_prepare-build-machine b/build-steps.d/1120_prepare-build-machine
@@ -134,10 +134,12 @@ build_machine_setup() {
          packages_to_be_installed+=" $linux_headers "
 
          true "INFO: Checking if VirtualBox is already installed..."
-         if virtualbox_version_installed="$(dpkg-query --show --showformat='${Version}' "virtualbox-6.1")" ; then
-            true "INFO: VirtualBox is already installed."
+         if virtualbox_version_installed="$(dpkg-query --show --showformat='${Version}' "virtualbox")" ; then
+            true "INFO: virtualbox is already installed."
+         elif virtualbox_version_installed="$(dpkg-query --show --showformat='${Version}' "virtualbox-6.1")" ; then
+            true "INFO: virtualbox-6.1 is already installed."
          else
-            true "${red}${bold}ERROR: virtualbox-6.1 is not yet installed. Please install as per build documentation.${reset}"
+            true "${red}${bold}ERROR: Neither package virtualbox nor package virtualbox-6.1 is installed. Please install as per build documentation.${reset}"
             error "See above!"
          fi