Merge pull request #232 from DustinCampbell/havoron-use-os-release

DustinCampbell · DustinCampbell · commit 15681e09ea69 · 2016-04-21T14:53:51.000-07:00
Use /etc/os-release to determine linux distro #204
diff --git a/src/utils.ts b/src/utils.ts
@@ -26,7 +26,7 @@ export function getSupportedPlatform() {
     }
     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/*-release').toString().toLowerCase();
+        let release = child_process.execSync('cat /etc/os-release').toString().toLowerCase();
 
         if (release.indexOf('ubuntu') >= 0) {
             return SupportedPlatform.Ubuntu;
@@ -43,4 +43,4 @@ export function getSupportedPlatform() {
     }
 
     return SupportedPlatform.None;	
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export function getSupportedPlatform() {`
`26`	`26`	`}`
`27`	`27`	`else if (process.platform === 'linux') {`
`28`	`28`	`// Get the text of /etc/*-release to discover which Linux distribution we're running on.`
`29`		`- let release = child_process.execSync('cat /etc/*-release').toString().toLowerCase();`
	`29`	`+ let release = child_process.execSync('cat /etc/os-release').toString().toLowerCase();`
`30`	`30`
`31`	`31`	`if (release.indexOf('ubuntu') >= 0) {`
`32`	`32`	`return SupportedPlatform.Ubuntu;`
`@@ -43,4 +43,4 @@ export function getSupportedPlatform() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return SupportedPlatform.None;`
`46`		`-}`
	`46`	`+}`