trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update prepare.sh

Browse Source 
Fix #642
This commit is contained in:
Chris Long
2021-04-26 23:27:18 -07:00
committed by GitHub
parent 0e7978bbc2
commit 6a7c5e66c9
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Vagrant/prepare.sh
View File

@@ -131,21 +131,27 @@ check_macos_bigsur() {
list_providers() { list_providers() {
VBOX_PRESENT=0 VBOX_PRESENT=0
VMWARE_FUSION_PRESENT=0 VMWARE_FUSION_PRESENT=0
VAGRANT_VMWARE_DESKTOP_PLUGIN_PRESENT=0
VAGRANT_VMWARE_UTILITY_PRESENT=0
if [ "$(uname)" == "Darwin" ]; then if [ "$(uname)" == "Darwin" ]; then
# Detect Providers on OSX # Detect Providers on OSX
VBOX_PRESENT=$(check_virtualbox_installed) VBOX_PRESENT=$(check_virtualbox_installed)
VMWARE_FUSION_PRESENT=$(check_vmware_fusion_installed) VMWARE_FUSION_PRESENT=$(check_vmware_fusion_installed)
VMWARE_WORKSTATION_PRESENT=0 # Workstation doesn't exist on Darwain-based OS VMWARE_WORKSTATION_PRESENT=0 # Workstation doesn't exist on Darwain-based OS
VAGRANT_VMWARE_DESKTOP_PLUGIN_PRESENT=$(check_vmware_desktop_vagrant_plugin_installed) if [ "$VMWARE_FUSION_PRESENT" -eq 1 ]; then
VAGRANT_VMWARE_UTILITY_PRESENT=$(check_vagrant_vmware_utility_installed) VAGRANT_VMWARE_DESKTOP_PLUGIN_PRESENT=$(check_vmware_desktop_vagrant_plugin_installed)
VAGRANT_VMWARE_UTILITY_PRESENT=$(check_vagrant_vmware_utility_installed)
fi
IS_BIGSUR=$(check_macos_bigsur) IS_BIGSUR=$(check_macos_bigsur)
else else
VBOX_PRESENT=$(check_virtualbox_installed) VBOX_PRESENT=$(check_virtualbox_installed)
VMWARE_WORKSTATION_PRESENT=$(check_vmware_workstation_installed) VMWARE_WORKSTATION_PRESENT=$(check_vmware_workstation_installed)
VMWARE_FUSION_PRESENT=0 # Fusion doesn't exist on non-Darwin OS VMWARE_FUSION_PRESENT=0 # Fusion doesn't exist on non-Darwin OS
VAGRANT_VMWARE_DESKTOP_PLUGIN_PRESENT=$(check_vmware_desktop_vagrant_plugin_installed) if [ "$VMWARE_WORKSTATION_PRESENT" -eq 1 ]; then
VAGRANT_VMWARE_UTILITY_PRESENT=$(check_vagrant_vmware_utility_installed) VAGRANT_VMWARE_DESKTOP_PLUGIN_PRESENT=$(check_vmware_desktop_vagrant_plugin_installed)
VAGRANT_VMWARE_UTILITY_PRESENT=$(check_vagrant_vmware_utility_installed)
fi
fi fi
(echo >&2 "Available Providers:") (echo >&2 "Available Providers:")