Skip to content

Fixing tsc error TS1252 in platform.ts #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2016
Merged

Fixing tsc error TS1252 in platform.ts #801

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8253257
Fixing tsc error TS1252 in platform.ts.
WardenGnaw Oct 6, 2016
4cf9a76
Changing getValue function to be Map
WardenGnaw Oct 7, 2016
46eb62b
Fixing code review issues
WardenGnaw Oct 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions src/platform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,31 @@ export enum Platform {
Ubuntu16
}

function convertOSReleaseTextToMap(text : string) : Map<string, string> {
let ret: Map<string, string> = new Map<string, string>();
const lines: string[] = text.split('\n');

for (let line of lines) {
line = line.trim();

let equalsIndex = line.indexOf('=');
if (equalsIndex >= 0) {
let key = line.substring(0, equalsIndex);
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 - 1);
}

ret.set(key, value);
}
}

return ret;
}


export function getCurrentPlatform() {
if (process.platform === 'win32') {
return Platform.Windows;
Expand All @@ -32,35 +57,14 @@ export function getCurrentPlatform() {
// For details: https://www.freedesktop.org/software/systemd/man/os-release.html
// When any new distro or version is added, please update GetClrDbg.sh in MIEngine or inform the contributers of MIEngine.
const text = child_process.execSync('cat /etc/os-release').toString();
const lines = text.split('\n');

function getValue(name: string) {
for (let line of lines) {
line = line.trim();
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 - 1);
}

return value;
}
}
}

return undefined;
}
const osReleaseMap = convertOSReleaseTextToMap(text);

const id = getValue("ID");
const id = osReleaseMap.get("ID");

switch (id)
{
case 'ubuntu':
const versionId = getValue("VERSION_ID");
const versionId = osReleaseMap.get("VERSION_ID");
if (versionId.startsWith("14")) {
// This also works for Linux Mint
return Platform.Ubuntu14;
Expand All @@ -84,7 +88,7 @@ export function getCurrentPlatform() {
// Oracle Linux is binary compatible with CentOS
return Platform.CentOS;
case 'elementary OS':
const eOSVersionId = getValue("VERSION_ID");
const eOSVersionId = osReleaseMap.get("VERSION_ID");
if (eOSVersionId.startsWith("0.3")) {
// Elementary OS 0.3 Freya is binary compatible with Ubuntu 14.04
return Platform.Ubuntu14;
Expand All @@ -96,7 +100,7 @@ export function getCurrentPlatform() {

break;
case 'linuxmint':
const lmVersionId = getValue("VERSION_ID");
const lmVersionId = osReleaseMap.get("VERSION_ID");
if (lmVersionId.startsWith("18")) {
// Linux Mint 18 is binary compatible with Ubuntu 16.04
return Platform.Ubuntu16;
Expand Down