Merge pull request #500 from DustinCampbell/update-linux-distros

Update linux distros for OmniSharp

Author: DustinCampbell

src/omnisharpDownload.ts

@@ -18,7 +18,7 @@ const decompress = require('decompress');
 
 const BaseDownloadUrl = 'https://omnisharpdownload.blob.core.windows.net/ext';
 const DefaultInstallLocation = path.join(__dirname, '../.omnisharp');
-export const OmniSharpVersion = '1.9-beta10';
+export const OmniSharpVersion = '1.9-beta11';
 
 tmp.setGracefulCleanup();
 
@@ -32,10 +32,16 @@ export function getOmnisharpAssetName(): string {
             return `omnisharp-${OmniSharpVersion}-centos-x64-netcoreapp1.0.tar.gz`;
         case SupportedPlatform.Debian:
             return `omnisharp-${OmniSharpVersion}-debian-x64-netcoreapp1.0.tar.gz`;
+        case SupportedPlatform.Fedora:
+            return `omnisharp-${OmniSharpVersion}-fedora-x64-netcoreapp1.0.tar.gz`;
+        case SupportedPlatform.OpenSUSE:
+            return `omnisharp-${OmniSharpVersion}-opensuse-x64-netcoreapp1.0.tar.gz`;
         case SupportedPlatform.RHEL:
             return `omnisharp-${OmniSharpVersion}-rhel-x64-netcoreapp1.0.tar.gz`;
-        case SupportedPlatform.Ubuntu:
-            return `omnisharp-${OmniSharpVersion}-ubuntu-x64-netcoreapp1.0.tar.gz`;
+        case SupportedPlatform.Ubuntu14:
+            return `omnisharp-${OmniSharpVersion}-ubuntu14-x64-netcoreapp1.0.tar.gz`;
+        case SupportedPlatform.Ubuntu16:
+            return `omnisharp-${OmniSharpVersion}-ubuntu16-x64-netcoreapp1.0.tar.gz`;
 
         default:
             if (process.platform === 'linux') {

src/utils.ts

@@ -13,8 +13,11 @@ export enum SupportedPlatform {
     OSX,
     CentOS,
     Debian,
+    Fedora,
+    OpenSUSE,
     RHEL,
-    Ubuntu
+    Ubuntu14,
+    Ubuntu16
 }
 
 export function getSupportedPlatform() {
@@ -25,24 +28,57 @@ export function getSupportedPlatform() {
         return SupportedPlatform.OSX;
     }
     else if (process.platform === 'linux') {
-        // Get the text of /etc/*-release to discover which Linux distribution we're running on.
-        let release = child_process.execSync('cat /etc/os-release').toString().toLowerCase();
+        // Get the text of /etc/os-release to discover which Linux distribution we're running on.
+        // For details: https://www.freedesktop.org/software/systemd/man/os-release.html
+        const text = child_process.execSync('cat /etc/os-release').toString();
+        const lines = text.split('\n');
 
-        if (release.indexOf('ubuntu') >= 0) {
-            return SupportedPlatform.Ubuntu;
-        }
-        else if (release.indexOf('centos') >= 0) {
-            return SupportedPlatform.CentOS;
-        }
-        else if (release.indexOf('rhel') >= 0) {
-            return SupportedPlatform.RHEL;
-        }
-        else if (release.indexOf('debian') >= 0) {
-            return SupportedPlatform.Debian;
+        function getValue(name: string) {
+            for (let line of lines) {
+                if (line.startsWith(name)) {
+                    const equalsIndex = line.indexOf('=');
+                    if (equalsIndex >= 0) {
+                        let value = line.substring(equalsIndex + 1);
+
+                        // Strip double quotes if necessary
+                        if (value.length > 1 && value.startsWith('"') && value.endsWith('"')) {
+                            value = value.substring(1, value.length - 2);
+                        }
+
+                        return value;
+                    }
+                }
+            }
+
+            return undefined;
         }
-        else if (release.indexOf('oracle') >= 0) {
-            // Oracle Linux is binary compatible with CentOS
-            return SupportedPlatform.CentOS;
+
+        const id = getValue("ID");
+
+        switch (id)
+        {
+            case 'ubuntu':
+                const versionId = getValue("VERSION_ID");
+                if (versionId.startsWith("14")) {
+                    // This also works for Linux Mint
+                    return SupportedPlatform.Ubuntu14;
+                }
+                else if (versionId.startsWith("16")) {
+                    return SupportedPlatform.Ubuntu16;
+                }
+            case 'centos':
+                return SupportedPlatform.CentOS;
+            case 'fedora':
+                return SupportedPlatform.Fedora;
+            case 'opensuse':
+                return SupportedPlatform.OpenSUSE;
+            case 'rehl':
+                return SupportedPlatform.RHEL;
+            case 'debian':
+                return SupportedPlatform.Debian;
+            case 'ol':
+                // Oracle Linux is binary compatible with CentOS
+                return SupportedPlatform.CentOS;
         }
     }