Skip to content
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

Update package: systeminformation - uses full PowerShell path #590

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Update package: systeminformation - uses full PowerShell path #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a70edd0
Update package: systeminformation - PowerShell PATH
webfiltered Jan 3, 2025
a445b34
Fix cannot start ComfyUI: File not found
webfiltered Jan 3, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"electron-log": "^5.2.0",
"electron-store": "8.2.0",
"node-pty": "^1.0.0",
"systeminformation": "^5.23.5",
"systeminformation": "^5.24.8",
"tar": "^7.4.3",
"tmp": "^0.2.3",
"wait-on": "^8.0.1",
Expand Down
3 changes: 2 additions & 1 deletion src/shell/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import os from 'node:os';
export function getDefaultShell(): string {
switch (os.platform()) {
case 'win32':
return 'powershell.exe';
// Use full path to avoid e.g. https://github.com/Comfy-Org/desktop/issues/584
return `${process.env.SYSTEMROOT}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
case 'darwin':
return 'zsh';
default: // Linux and others
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ __metadata:
node-pty: "npm:^1.0.0"
prettier: "npm:^3.3.3"
rimraf: "npm:^6.0.1"
systeminformation: "npm:^5.23.5"
systeminformation: "npm:^5.24.8"
tar: "npm:^7.4.3"
tmp: "npm:^0.2.3"
ts-node: "npm:^10.0.0"
Expand Down Expand Up @@ -11437,12 +11437,12 @@ __metadata:
languageName: node
linkType: hard

"systeminformation@npm:^5.23.5":
version: 5.23.5
resolution: "systeminformation@npm:5.23.5"
"systeminformation@npm:^5.24.8":
version: 5.24.8
resolution: "systeminformation@npm:5.24.8"
bin:
systeminformation: lib/cli.js
checksum: 10c0/849283b2886c46ff5e79594e939c87202b5283b8aa16cd0d665c595781dba51913060728bae95b94837b78c3a515a0f00ab0a0471604990c5c778f555bd075ea
checksum: 10c0/d23b41a4deb23d368b0b8e7991598e0534a818a76aa79f528fd2b724b575c41bc5faf9264f9adffac8ea34768371fc619384207d081d7f7e2542c330499ceddc
conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android)
languageName: node
linkType: hard
Expand Down
Loading