Skip to content

fix(shim): properly check wslpath/cygpath command first #6114

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
niheaven merged 5 commits into from
Oct 9, 2024
Merged

fix(shim): properly check wslpath/cygpath command first #6114

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ddefe7
fix(shim): properly check `wslpath`/`cygpath` command
sitiom Aug 19, 2024
d803601
Update CHANGELOG.md
sitiom Aug 19, 2024
e182062
Update lib/core.ps1
sitiom Aug 19, 2024
3daf211
Properly escape special characters & quote arguments
sitiom Aug 20, 2024
b030aa3
Merge branch 'develop' into patch-1
niheaven Oct 9, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Bug Fixes

- **decompress**: `Expand-7zipArchive` only delete temp dir / `$extractDir` if it is empty ([#6092](https://github.com/ScoopInstaller/Scoop/issues/6092))
- **shim:** Do not suppress `stderr`, properly check `wslpath`/`cygpath` command first ([#6114](https://github.com/ScoopInstaller/Scoop/pull/6114))

### Code Refactoring

Expand Down
11 changes: 8 additions & 3 deletions lib/core.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,9 +1005,14 @@ function shim($path, $global, $name, $arg) {
warn_on_overwrite "$shim.cmd" $path
@(
"@rem $resolved_path",
"@bash `"`$(wslpath -u '$resolved_path')`" $arg %* 2>nul",
'@if %errorlevel% neq 0 (',
" @bash `"`$(cygpath -u '$resolved_path')`" $arg %* 2>nul",
'@bash -c "command -v wslpath >/dev/null 2>&1"',
'@if %errorlevel% equ 0 (',
" @bash `"`$(wslpath -u '$resolved_path')`" $arg %*",
') else (',
' @bash -c "command -v cygpath >/dev/null 2>&1"',
' @if %errorlevel% equ 0 (',
" @bash `"`$(cygpath -u '$resolved_path')`" $arg %*",
' )',
Comment thread
sitiom marked this conversation as resolved.
Outdated
')'
) -join "`r`n" | Out-UTF8File "$shim.cmd"

Expand Down
⚡