Skip to content

Choose shortest (instead of first) bundle URL from installer stderr as app folder #1161

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
rgoldberg merged 1 commit into from
Dec 27, 2025
Merged

Choose shortest (instead of first) bundle URL from installer stderr as app folder #1161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions Sources/mas/AppStore/AppStoreAction+download.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,19 +395,19 @@ private actor DownloadQueueObserver: CKDownloadQueueObserver {
)
}
guard
let appFolderURLResult = appFolderURLRegex
.firstMatch(in: standardErrorText, range: NSRange(location: 0, length: standardErrorText.count)),
let appFolderURLString
= appFolderURLResult.captureGroupMatch(number: 1, in: standardErrorText).map(String.init(_:))
let appFolderURLSubstring = appFolderURLRegex
.matches(in: standardErrorText, range: NSRange(location: 0, length: standardErrorText.count))
.compactMap({ $0.captureGroupMatch(number: 1, in: standardErrorText) })
.min(by: { $0.count < $1.count })
else {
throw MASError.error(
"Failed to find app folder URL in installer output for \(appNameAndVersion)",
error: standardErrorText
)
}
guard let appFolderURL = URL(string: appFolderURLString) else {
guard let appFolderURL = URL(string: String(appFolderURLSubstring)) else {
throw MASError.error(
"Failed to parse app folder URL for \(appNameAndVersion) from \(appFolderURLString)",
"Failed to parse app folder URL for \(appNameAndVersion) from \(appFolderURLSubstring)",
error: standardErrorText
)
}
Expand Down
Loading