Skip to content

Commit ff7b632

Browse files
committed
JBDS-4036 Installer should verify detected Virtualbox is 5.0.x
1 parent ad6def0 commit ff7b632

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

browser/model/virtualbox.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class VirtualBoxInstall extends InstallableItem {
2222

2323
this.minimumVersion = '5.0.26';
2424
this.version = version || '5.0.26';
25+
this.maximumVersion = '5.1.0';
2526
this.revision = revision;
2627
this.downloadedFileName = 'virtualbox.exe';
2728
this.bundledFile = path.join(this.downloadFolder, this.downloadedFileName);
@@ -98,7 +99,7 @@ class VirtualBoxInstall extends InstallableItem {
9899
var command = '"' + path.join(output, 'VBoxManage' + extension) +'"' + ' --version';
99100
return Util.executeCommand(command, 1);
100101
}).then((output) => {
101-
let version = versionRegex.exec(output)[1];
102+
let version = versionRegex.exec(output)[1];
102103
this.addOption('detected',version,tempDetectedLocation,Version.GE(version,this.minimumVersion));
103104
this.selectedOption = 'detected';
104105
this.validateVersion();
@@ -119,10 +120,14 @@ class VirtualBoxInstall extends InstallableItem {
119120
installOption.valid = false;
120121
installOption.error = 'oldVersion';
121122
installOption.warning = '';
122-
} else if(Version.GT(installOption.version,this.minimumVersion)) {
123+
} else if(Version.GT(installOption.version,this.minimumVersion) && Version.LT(installOption.version,this.maximumVersion)) {
123124
installOption.valid = true;
124125
installOption.error = '';
125126
installOption.warning = 'newerVersion';
127+
} else if(Version.GE(installOption.version,this.maximumVersion)) {
128+
installOption.valid = false;
129+
installOption.error = '';
130+
installOption.warning = 'newerVersion';
126131
}
127132
}
128133

browser/pages/confirm/confirm.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120

121121
<div class="message-container error-message" ng-show="!checkboxModel.virtualbox.isConfigured() && checkboxModel.cdk.selectedOption == 'install'">
122122
<span class="pficon pficon-error-circle-o"></span>
123-
<span>Red Hat Container Development Kit requires Oracle VirtualBox {{checkboxModel.virtualbox.minimumVersion}} or newer. Please uninstall detected Oracle VirtualBox and restart Installer to continue.</span>
123+
<span>Red Hat Container Development Kit requires Oracle VirtualBox {{checkboxModel.virtualbox.minimumVersion}} or newer 5.0.x release. Please uninstall detected Oracle VirtualBox and restart Installer to continue.</span>
124124
</div>
125125

126126
<!-- Cygwin -->

0 commit comments

Comments
 (0)