Dark-Alex-17/macos-virtualbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

making sure WSL runs the Windows executable

Browse Source
This commit is contained in:
img2tab
2019-05-31 01:35:40 +00:00
committed by GitHub
parent 3ba024f3e0
commit 42cb76cf73
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
macos-guest-virtualbox.sh
+12 -7
View File
@@ -2,7 +2,7 @@
# One-key semi-automatic installer of macOS on VirtualBox # One-key semi-automatic installer of macOS on VirtualBox
# (c) img2tab, licensed under GPL2.0 or higher # (c) img2tab, licensed under GPL2.0 or higher
# url: https://github.com/img2tab/macos-guest-virtualbox # url: https://github.com/img2tab/macos-guest-virtualbox
# version 0.62.1 # version 0.63.0
# Requirements: 37.5GB available storage on host # Requirements: 37.5GB available storage on host
# Dependencies: bash>=4.0, unzip, wget, dmg2img, # Dependencies: bash>=4.0, unzip, wget, dmg2img,
@@ -102,9 +102,9 @@ fi
# VirtualBox in ${PATH} # VirtualBox in ${PATH}
# Cygwin # Cygwin
if [ -n "$(cygcheck -V 2>/dev/null)" ]; then if [ -n "$(cygcheck -V 2>/dev/null)" ]; then
if [ -n "$(cmd.exe /d /s /c call VBoxManage -v 2>/dev/null)" ]; then if [ -n "$(cmd.exe /d /s /c call VBoxManage.exe -v 2>/dev/null)" ]; then
function VBoxManage() { function VBoxManage() {
cmd.exe /d /s /c call VBoxManage "$@" cmd.exe /d /s /c call VBoxManage.exe "$@"
} }
else else
cmd_path_VBoxManage='C:\Program Files\Oracle\VirtualBox\VBoxManage.exe' cmd_path_VBoxManage='C:\Program Files\Oracle\VirtualBox\VBoxManage.exe'
@@ -117,15 +117,20 @@ if [ -n "$(cygcheck -V 2>/dev/null)" ]; then
echo "Found VBoxManage" echo "Found VBoxManage"
else else
echo "Please make sure VirtualBox is installed, and that the path to the" echo "Please make sure VirtualBox is installed, and that the path to the"
echo "VBoxManage executable is in the PATH variable, or assigned in the script" echo "VBoxManage.exe executable is in the PATH variable, or assigned in the script"
printf 'to the variable '${whiteonblack}'cmd_path_VBoxManage'${defaultcolor}' including the name of the executable.' printf 'to the variable '${whiteonblack}'cmd_path_VBoxManage'${defaultcolor}' including the name of the executable.'
exit exit
fi fi
fi fi
# Windows Subsystem for Linux (WSL) # Windows Subsystem for Linux (WSL)
elif [[ "$(cat /proc/sys/kernel/osrelease 2>/dev/null)" =~ Microsoft ]]; then elif [[ "$(cat /proc/sys/kernel/osrelease 2>/dev/null)" =~ Microsoft ]]; then
if [ -n "$(VBoxManage.exe -v 2>/dev/null)" ]; then
function VBoxManage() {
VBoxManage.exe "$@"
}
else
wsl_path_VBoxManage='/mnt/c/Program Files/Oracle/VirtualBox/VBoxManage.exe' wsl_path_VBoxManage='/mnt/c/Program Files/Oracle/VirtualBox/VBoxManage.exe'
if [ -z "$(VBoxManage -v 2>/dev/null)" ]; then echo "Can't find VBoxManage in PATH variable,"
echo "checking ${wsl_path_VBoxManage}" echo "checking ${wsl_path_VBoxManage}"
if [ -n "$("${wsl_path_VBoxManage}" -v 2>/dev/null)" ]; then if [ -n "$("${wsl_path_VBoxManage}" -v 2>/dev/null)" ]; then
function VBoxManage() { function VBoxManage() {
@@ -133,8 +138,8 @@ elif [[ "$(cat /proc/sys/kernel/osrelease 2>/dev/null)" =~ Microsoft ]]; then
} }
echo "Found VBoxManage" echo "Found VBoxManage"
else else
echo "Please make sure VirtualBox is installed, and that the path to the" echo "Please make sure VirtualBox is installed on Windows, and that the path to the"
echo "VBoxManage executable is in the PATH variable, or assigned in the script" echo "VBoxManage.exe executable is in the PATH variable, or assigned in the script"
printf 'to the variable '${whiteonblack}'wsl_path_VBoxManage'${defaultcolor}' including the name of the executable.' printf 'to the variable '${whiteonblack}'wsl_path_VBoxManage'${defaultcolor}' including the name of the executable.'
exit exit
fi fi