From daa22d25704b158d152a3e838edda8e55e75454d Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Thu, 25 May 2017 10:21:10 +0200
Subject: [PATCH] Windows: guess path on D:, too

Many Windows PCs these days come with an SSD and an HDD. Having
VirtualBox on D: rather than on C: is increasingly common.

With this patch, the standard VBoxManage location on D: is also checked
before the full harddisk search is launched.

Change-Id: Ibca9be7cc94a71a904cbe82fd17a31bd002712c8
---
 labs/osbash/lib/wbatch/template-find_vbm_bat                | 6 ++++++
 .../batch_for_windows_templates/template-find_vbm_bat       | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/labs/osbash/lib/wbatch/template-find_vbm_bat b/labs/osbash/lib/wbatch/template-find_vbm_bat
index a4d252dd..c4d7449b 100644
--- a/labs/osbash/lib/wbatch/template-find_vbm_bat
+++ b/labs/osbash/lib/wbatch/template-find_vbm_bat
@@ -3,6 +3,12 @@ CALL "%~dp0\CONFIG.BAT"
 
 IF EXIST "%VBM%" GOTO vbm_found
 
+REM Before searching, try a likely alternative
+
+SET VBM=d:\Program Files\Oracle\VirtualBox\VBoxManage.exe
+
+IF EXIST "%VBM%" GOTO vbm_found
+
 ECHO.
 ECHO %time% Searching %SystemDrive% for VBoxManage, this may take a while
 ECHO.
diff --git a/labs/stacktrain/batch_for_windows_templates/template-find_vbm_bat b/labs/stacktrain/batch_for_windows_templates/template-find_vbm_bat
index a4d252dd..c4d7449b 100644
--- a/labs/stacktrain/batch_for_windows_templates/template-find_vbm_bat
+++ b/labs/stacktrain/batch_for_windows_templates/template-find_vbm_bat
@@ -3,6 +3,12 @@ CALL "%~dp0\CONFIG.BAT"
 
 IF EXIST "%VBM%" GOTO vbm_found
 
+REM Before searching, try a likely alternative
+
+SET VBM=d:\Program Files\Oracle\VirtualBox\VBoxManage.exe
+
+IF EXIST "%VBM%" GOTO vbm_found
+
 ECHO.
 ECHO %time% Searching %SystemDrive% for VBoxManage, this may take a while
 ECHO.