diff --git a/dist/index.js b/dist/index.js index 1774d723..ee1c47a6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -134121,7 +134121,7 @@ function versions(apps, callback) { if ({}.hasOwnProperty.call(appsObj.versions, 'powershell')) { if (_windows) { util.powerShell('$PSVersionTable').then(stdout => { - const lines = stdout.toString().split('\n').map(line => line.replace(/ +/g, ' ').replace(/ +/g, ':')); + const lines = stdout.toString().toLowerCase().split('\n').map(line => line.replace(/ +/g, ' ').replace(/ +/g, ':')); appsObj.versions.powershell = util.getValue(lines, 'psversion'); functionProcessed(); }); @@ -134160,7 +134160,26 @@ function shell(callback) { return new Promise((resolve) => { process.nextTick(() => { if (_windows) { - resolve('cmd'); + try { + const result = 'CMD'; + util.powerShell(`Get-CimInstance -className win32_process | where-object {$_.ProcessId -eq ${process.ppid} } | select Name`).then(stdout => { + let result = 'CMD'; + if (stdout) { + if (stdout.toString().toLowerCase().indexOf('powershell') >= 0) { + result = 'PowerShell'; + } + } + if (callback) { + callback(result); + } + resolve(result); + }); + } catch { + if (callback) { + callback(result); + } + resolve(result); + } } else { let result = ''; exec('echo $SHELL', function (error, stdout) { @@ -136027,7 +136046,7 @@ function system(callback) { const model = util.getValue(lines, 'model:', ':', true); // reference values: https://elinux.org/RPi_HardwareHistory // https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md - if ((result.model === 'BCM2835' || result.model === 'BCM2708' || result.model === 'BCM2709' || result.model === 'BCM2710' || result.model === 'BCM2711' || result.model === 'BCM2836' || result.model === 'BCM2837') && model.toLowerCase().indexOf('raspberry') >= 0) { + if ((result.model === 'BCM2835' || result.model === 'BCM2708' || result.model === 'BCM2709' || result.model === 'BCM2710' || result.model === 'BCM2711' || result.model === 'BCM2836' || result.model === 'BCM2837' || result.model === '') && model.toLowerCase().indexOf('raspberry') >= 0) { const rPIRevision = util.decodePiCpuinfo(lines); result.model = rPIRevision.model; result.version = rPIRevision.revisionCode; @@ -137915,7 +137934,8 @@ function isRaspberry() { } const hardware = getValue(cpuinfo, 'hardware'); - return (hardware && PI_MODEL_NO.indexOf(hardware) > -1); + const model = getValue(cpuinfo, 'model'); + return ((hardware && PI_MODEL_NO.indexOf(hardware) > -1) || (model && model.indexOf('Raspberry Pi') > -1)); } function isRaspbian() { @@ -149407,7 +149427,7 @@ module.exports = /*#__PURE__*/JSON.parse('[["0","\\u0000",128],["a1","。",62],[ /***/ 15460: /***/ ((module) => { -module.exports = {"rE":"5.25.3"}; +module.exports = {"rE":"5.25.6"}; /***/ }), @@ -152259,7 +152279,9 @@ function findOne(test, nodes, recurse = true) { return node; } if (recurse && hasChildren(node) && node.children.length > 0) { - return findOne(test, node.children, true); + const found = findOne(test, node.children, true); + if (found) + return found; } } return null; diff --git a/dist/post/index.js b/dist/post/index.js index 94b9bdaf..adc40876 100644 --- a/dist/post/index.js +++ b/dist/post/index.js @@ -99365,7 +99365,7 @@ function versions(apps, callback) { if ({}.hasOwnProperty.call(appsObj.versions, 'powershell')) { if (_windows) { util.powerShell('$PSVersionTable').then(stdout => { - const lines = stdout.toString().split('\n').map(line => line.replace(/ +/g, ' ').replace(/ +/g, ':')); + const lines = stdout.toString().toLowerCase().split('\n').map(line => line.replace(/ +/g, ' ').replace(/ +/g, ':')); appsObj.versions.powershell = util.getValue(lines, 'psversion'); functionProcessed(); }); @@ -99404,7 +99404,26 @@ function shell(callback) { return new Promise((resolve) => { process.nextTick(() => { if (_windows) { - resolve('cmd'); + try { + const result = 'CMD'; + util.powerShell(`Get-CimInstance -className win32_process | where-object {$_.ProcessId -eq ${process.ppid} } | select Name`).then(stdout => { + let result = 'CMD'; + if (stdout) { + if (stdout.toString().toLowerCase().indexOf('powershell') >= 0) { + result = 'PowerShell'; + } + } + if (callback) { + callback(result); + } + resolve(result); + }); + } catch { + if (callback) { + callback(result); + } + resolve(result); + } } else { let result = ''; exec('echo $SHELL', function (error, stdout) { @@ -101271,7 +101290,7 @@ function system(callback) { const model = util.getValue(lines, 'model:', ':', true); // reference values: https://elinux.org/RPi_HardwareHistory // https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md - if ((result.model === 'BCM2835' || result.model === 'BCM2708' || result.model === 'BCM2709' || result.model === 'BCM2710' || result.model === 'BCM2711' || result.model === 'BCM2836' || result.model === 'BCM2837') && model.toLowerCase().indexOf('raspberry') >= 0) { + if ((result.model === 'BCM2835' || result.model === 'BCM2708' || result.model === 'BCM2709' || result.model === 'BCM2710' || result.model === 'BCM2711' || result.model === 'BCM2836' || result.model === 'BCM2837' || result.model === '') && model.toLowerCase().indexOf('raspberry') >= 0) { const rPIRevision = util.decodePiCpuinfo(lines); result.model = rPIRevision.model; result.version = rPIRevision.revisionCode; @@ -103159,7 +103178,8 @@ function isRaspberry() { } const hardware = getValue(cpuinfo, 'hardware'); - return (hardware && PI_MODEL_NO.indexOf(hardware) > -1); + const model = getValue(cpuinfo, 'model'); + return ((hardware && PI_MODEL_NO.indexOf(hardware) > -1) || (model && model.indexOf('Raspberry Pi') > -1)); } function isRaspbian() { @@ -114595,7 +114615,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"name":"@actions/cache","version":"4. /***/ 15460: /***/ ((module) => { -module.exports = {"rE":"5.25.3"}; +module.exports = {"rE":"5.25.6"}; /***/ }) diff --git a/packages/analysis/package.json b/packages/analysis/package.json index 58cd1fe5..4db5f0a5 100644 --- a/packages/analysis/package.json +++ b/packages/analysis/package.json @@ -21,6 +21,6 @@ "@tsconfig/strictest": "2.0.5", "@types/node": "22.10.5", "@vercel/ncc": "0.38.3", - "typescript": "5.7.2" + "typescript": "5.7.3" } } diff --git a/packages/lint-doc/package.json b/packages/lint-doc/package.json index 895a739c..0b86b1aa 100644 --- a/packages/lint-doc/package.json +++ b/packages/lint-doc/package.json @@ -16,6 +16,6 @@ "@tsconfig/strictest": "2.0.5", "@types/node": "22.10.5", "@vercel/ncc": "0.38.3", - "typescript": "5.7.2" + "typescript": "5.7.3" } } diff --git a/packages/lint-fmt/package.json b/packages/lint-fmt/package.json index c5ad1ece..149e3a96 100644 --- a/packages/lint-fmt/package.json +++ b/packages/lint-fmt/package.json @@ -16,6 +16,6 @@ "@tsconfig/strictest": "2.0.5", "@types/node": "22.10.5", "@vercel/ncc": "0.38.3", - "typescript": "5.7.2" + "typescript": "5.7.3" } } diff --git a/packages/lint-opam/package.json b/packages/lint-opam/package.json index af498b89..f5b91e11 100644 --- a/packages/lint-opam/package.json +++ b/packages/lint-opam/package.json @@ -16,6 +16,6 @@ "@tsconfig/strictest": "2.0.5", "@types/node": "22.10.5", "@vercel/ncc": "0.38.3", - "typescript": "5.7.2" + "typescript": "5.7.3" } } diff --git a/packages/setup-ocaml/package.json b/packages/setup-ocaml/package.json index df6360d6..79d3859a 100644 --- a/packages/setup-ocaml/package.json +++ b/packages/setup-ocaml/package.json @@ -19,7 +19,7 @@ "@actions/tool-cache": "2.0.1", "cheerio": "1.0.0", "semver": "7.6.3", - "systeminformation": "5.25.3", + "systeminformation": "5.25.6", "yaml": "2.7.0" }, "devDependencies": { @@ -28,6 +28,6 @@ "@types/node": "22.10.5", "@types/semver": "7.5.8", "@vercel/ncc": "0.38.3", - "typescript": "5.7.2" + "typescript": "5.7.3" } } diff --git a/yarn.lock b/yarn.lock index 8874bb0b..263398ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -444,7 +444,7 @@ __metadata: "@vercel/ncc": "npm:0.38.3" packageurl-js: "npm:2.0.1" strip-ansi: "npm:7.1.0" - typescript: "npm:5.7.2" + typescript: "npm:5.7.3" languageName: unknown linkType: soft @@ -458,7 +458,7 @@ __metadata: "@tsconfig/strictest": "npm:2.0.5" "@types/node": "npm:22.10.5" "@vercel/ncc": "npm:0.38.3" - typescript: "npm:5.7.2" + typescript: "npm:5.7.3" languageName: unknown linkType: soft @@ -472,7 +472,7 @@ __metadata: "@tsconfig/strictest": "npm:2.0.5" "@types/node": "npm:22.10.5" "@vercel/ncc": "npm:0.38.3" - typescript: "npm:5.7.2" + typescript: "npm:5.7.3" languageName: unknown linkType: soft @@ -486,7 +486,7 @@ __metadata: "@tsconfig/strictest": "npm:2.0.5" "@types/node": "npm:22.10.5" "@vercel/ncc": "npm:0.38.3" - typescript: "npm:5.7.2" + typescript: "npm:5.7.3" languageName: unknown linkType: soft @@ -509,8 +509,8 @@ __metadata: "@vercel/ncc": "npm:0.38.3" cheerio: "npm:1.0.0" semver: "npm:7.6.3" - systeminformation: "npm:5.25.3" - typescript: "npm:5.7.2" + systeminformation: "npm:5.25.6" + typescript: "npm:5.7.3" yaml: "npm:2.7.0" languageName: unknown linkType: soft @@ -565,10 +565,10 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^22.2.0": - version: 22.2.0 - resolution: "@octokit/openapi-types@npm:22.2.0" - checksum: 10c0/a45bfc735611e836df0729f5922bbd5811d401052b972d1e3bc1278a2d2403e00f4552ce9d1f2793f77f167d212da559c5cb9f1b02c935114ad6d898779546ee +"@octokit/openapi-types@npm:^23.0.1": + version: 23.0.1 + resolution: "@octokit/openapi-types@npm:23.0.1" + checksum: 10c0/ab734ceb26343d9f051a59503b8cb5bdc7fec9ca044b60511b227179bec73141dd9144a6b2d68bcd737741881b136c1b7d5392da89ae2e35e39acc489e5eb4c1 languageName: node linkType: hard @@ -627,11 +627,11 @@ __metadata: linkType: hard "@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0": - version: 13.6.2 - resolution: "@octokit/types@npm:13.6.2" + version: 13.7.0 + resolution: "@octokit/types@npm:13.7.0" dependencies: - "@octokit/openapi-types": "npm:^22.2.0" - checksum: 10c0/ea51afb21b667b25dad9e5daae1701da1b362a4d6ed9609f6d3f9f219e5389bf50f7e53ae029ca190750e278be3ab963cac648a95ad248f245a5fda16a4f1ed1 + "@octokit/openapi-types": "npm:^23.0.1" + checksum: 10c0/62ed4f00304360cc31e99a9dc97ac4f48075d1d5c09a272f09b1fd3dfcc7a6169b7fab109030319ef121b0cd880c85bdb20363f4992104e07a98bd8323beeeb5 languageName: node linkType: hard @@ -1035,13 +1035,13 @@ __metadata: linkType: hard "domutils@npm:^3.0.1, domutils@npm:^3.1.0": - version: 3.2.1 - resolution: "domutils@npm:3.2.1" + version: 3.2.2 + resolution: "domutils@npm:3.2.2" dependencies: dom-serializer: "npm:^2.0.0" domelementtype: "npm:^2.3.0" domhandler: "npm:^5.0.3" - checksum: 10c0/af2a8e28fe51137307d2400c4b6483a3294ac8f784b14fc74b67f3aca3aa53a63144bd9e2bb96f23174c0c1aa680544bf2d77b4cc94e6f90f33314ed65c12a4f + checksum: 10c0/47938f473b987ea71cd59e59626eb8666d3aa8feba5266e45527f3b636c7883cca7e582d901531961f742c519d7514636b7973353b648762b2e3bedbf235fada languageName: node linkType: hard @@ -1900,12 +1900,12 @@ __metadata: languageName: node linkType: hard -"systeminformation@npm:5.25.3": - version: 5.25.3 - resolution: "systeminformation@npm:5.25.3" +"systeminformation@npm:5.25.6": + version: 5.25.6 + resolution: "systeminformation@npm:5.25.6" bin: systeminformation: lib/cli.js - checksum: 10c0/0002e1492ea3c8113e72e5d235e40761e01c72e5b493e691ae3b421dc8a0e15cd9179f56489180613a9168c003ba98ea8ae2cc0f871a66088329b033ed55b283 + checksum: 10c0/a483a206671069c7357899295870c1f4b548aa1d6823740ef4eb02e6d64aa6f238a9873861378c66397713eea70f71de4f6d1db620456583c7f725da97c50ed6 conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android) languageName: node linkType: hard @@ -2057,13 +2057,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.7.2": - version: 5.7.2 - resolution: "typescript@npm:5.7.2" +"typescript@npm:5.7.3": + version: 5.7.3 + resolution: "typescript@npm:5.7.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/a873118b5201b2ef332127ef5c63fb9d9c155e6fdbe211cbd9d8e65877283797cca76546bad742eea36ed7efbe3424a30376818f79c7318512064e8625d61622 + checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa languageName: node linkType: hard @@ -2077,13 +2077,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.7.2#optional!builtin": - version: 5.7.2 - resolution: "typescript@patch:typescript@npm%3A5.7.2#optional!builtin::version=5.7.2&hash=5786d5" +"typescript@patch:typescript@npm%3A5.7.3#optional!builtin": + version: 5.7.3 + resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin::version=5.7.3&hash=5786d5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10c0/f3b8082c9d1d1629a215245c9087df56cb784f9fb6f27b5d55577a20e68afe2a889c040aacff6d27e35be165ecf9dca66e694c42eb9a50b3b2c451b36b5675cb + checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4 languageName: node linkType: hard