From 58d94c85087390f33bfadd1f81a67aedbdaecf46 Mon Sep 17 00:00:00 2001 From: Joou Date: Sun, 28 May 2017 15:48:26 +0800 Subject: [PATCH 1/3] More robustness for getting os version on Windows --- lib/user-utilities.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/user-utilities.coffee b/lib/user-utilities.coffee index 55d824a6..8dafe650 100644 --- a/lib/user-utilities.coffee +++ b/lib/user-utilities.coffee @@ -86,7 +86,7 @@ module.exports = stdout: (oneLine) -> data.push(oneLine) exit: -> info = data.join('\n') - info = if (res = /OS.Name.\s+(.*)$/im.exec(info)) then res[1] else 'Unknown Windows version' + info = if (res = /OS.+(Microsoft.+)$/im.exec(info)) then res[1] else 'Unknown Windows version' resolve(info) systemInfo.onWillThrowError ({handle}) -> From 5ee949007e41fb40367c7a47cae441f9bb3a91b1 Mon Sep 17 00:00:00 2001 From: John Chou Date: Mon, 29 May 2017 22:35:02 +0800 Subject: [PATCH 2/3] Update user-utilities.coffee --- lib/user-utilities.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/user-utilities.coffee b/lib/user-utilities.coffee index 8dafe650..9ae73783 100644 --- a/lib/user-utilities.coffee +++ b/lib/user-utilities.coffee @@ -86,7 +86,7 @@ module.exports = stdout: (oneLine) -> data.push(oneLine) exit: -> info = data.join('\n') - info = if (res = /OS.+(Microsoft.+)$/im.exec(info)) then res[1] else 'Unknown Windows version' + info = if (res = /OS.+(Microsoft.+)$/im.exec(info)) then res[1] else 'Unknown Windows version' resolve(info) systemInfo.onWillThrowError ({handle}) -> From d4d4cf1995915bbb2636becf1903a3d7a5db9c00 Mon Sep 17 00:00:00 2001 From: John Chou Date: Mon, 29 May 2017 22:35:35 +0800 Subject: [PATCH 3/3] Update user-utilities.coffee --- lib/user-utilities.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/user-utilities.coffee b/lib/user-utilities.coffee index 9ae73783..8dafe650 100644 --- a/lib/user-utilities.coffee +++ b/lib/user-utilities.coffee @@ -86,7 +86,7 @@ module.exports = stdout: (oneLine) -> data.push(oneLine) exit: -> info = data.join('\n') - info = if (res = /OS.+(Microsoft.+)$/im.exec(info)) then res[1] else 'Unknown Windows version' + info = if (res = /OS.+(Microsoft.+)$/im.exec(info)) then res[1] else 'Unknown Windows version' resolve(info) systemInfo.onWillThrowError ({handle}) ->