Handle OS in PHP version string

pull/15/head
Felix Becker 2016-09-15 11:07:44 +02:00
parent 4fd3eb3f7c
commit 06d3100f04
1 changed files with 2 additions and 1 deletions

View File

@ -21,7 +21,8 @@ export function activate(context: vscode.ExtensionContext) {
return; return;
} }
let version = stdout.toString().match(/^PHP ([^\s]+)/)[1]; // Parse version and discard OS info like 7.0.8--0ubuntu0.16.04.2
let version = stdout.toString().match(/^PHP ([^\s]+)/)[1].split('-')[0];
// Convert PHP prerelease format like 7.0.0rc1 to 7.0.0-rc1 // Convert PHP prerelease format like 7.0.0rc1 to 7.0.0-rc1
if (!/^\d+.\d+.\d+$/.test(version)) { if (!/^\d+.\d+.\d+$/.test(version)) {
version = version.replace(/(\d+.\d+.\d+)/, '$1-'); version = version.replace(/(\d+.\d+.\d+)/, '$1-');