Repository navigation
fix(wine): select the client root that actually holds bin/ - #24
Merged
Merged
Conversation
`uur run` aborted with "WebView2 bootstrapper missing from the client
directory" on a complete install.
`find_client_dir` searched depth-first for `GameViewerServer.exe` and
returned the first hit, special-casing only a parent named `bin`. NetEase
ships the payload twice: as `<root>/bin/` and as a sibling
`<root>/<version>/`. When readdir order reached `<root>/<version>/` first,
that directory was returned as the client root. It has no `bin/`
subdirectory, so every `join("bin")` lookup missed -- the WebView2
bootstrapper and the terminal proxies -- and the session bailed out.
`deploy_terminal_proxy` then created a spurious `bin/` inside the version
directory and wrote proxies into it.
Now every directory holding `GameViewer.exe` is collected and ranked:
`bin/GameViewerServer.exe` scores highest because that is the layout uur
drives, then `bin/MicrosoftEdgeWebview2Setup.exe`, then a top-level
server. Ties break on path depth, then lexically, so the choice no longer
depends on readdir order. A versioned copy is still used when it is the
only candidate.
Adds four tests covering both layouts, readdir stability, and the
fallback.
Contributor
Author
|
need review again |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
uur runaborted with "WebView2 bootstrapper missing from the client directory" on a complete install.find_client_dirsearched depth-first forGameViewerServer.exeand returned the first hit, special-casing only a parent namedbin. NetEase ships the payload twice: as<root>/bin/and as a sibling<root>/<version>/. When readdir order reached<root>/<version>/first, that directory was returned as the client root. It has nobin/subdirectory, so everyjoin("bin")lookup missed -- the WebView2 bootstrapper and the terminal proxies -- and the session bailed out.deploy_terminal_proxythen created a spuriousbin/inside the version directory and wrote proxies into it.Now every directory holding
GameViewer.exeis collected and ranked:bin/GameViewerServer.exescores highest because that is the layout uur drives, thenbin/MicrosoftEdgeWebview2Setup.exe, then a top-level server. Ties break on path depth, then lexically, so the choice no longer depends on readdir order. A versioned copy is still used when it is the only candidate.Adds four tests covering both layouts, readdir stability, and the fallback.