Skip to content

Fix TypeError raised from installDMG() #49

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

Open
dahlia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix TypeError raised from installDMG() #49

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
19 changes: 8 additions & 11 deletions src/deno/BrowserFetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,33 +503,30 @@ async function extractTar(tarPath: string, folderPath: string): Promise<void> {
async function installDMG(dmgPath: string, folderPath: string): Promise<void> {
let mountPath;
try {
const proc = Deno.run({
cmd: ["hdiutil", "attach", "-nobrowse", "-noautoopen", dmgPath],
const output = await Deno.spawn("hdiutil", {
args: ["attach", "-nobrowse", "-noautoopen", dmgPath],
});
const stdout = new TextDecoder().decode(await proc.output());
proc.close();
const stdout = new TextDecoder().decode(output.stdout);
const volumes = stdout.match(/\/Volumes\/(.*)/m);
if (!volumes) throw new Error(`Could not find volume path in ${stdout}`);
mountPath = volumes[0];

let appName = undefined;
for await (const file of Deno.readDir(mountPath)) {
if (file.name.endsWith(".app")) {
if (file.name.endsWith(".app") && file.isDirectory) {
appName = file.name;
break;
}
}
if (!appName) throw new Error(`Cannot find app in ${mountPath}`);
copyDir(pathJoin(mountPath, appName), folderPath);
await copyDir(pathJoin(mountPath, appName), pathJoin(folderPath, appName));
} finally {
if (mountPath) {
const proc = Deno.run({
cmd: ["hdiutil", "detach", mountPath, "-quiet"],
const output = await Deno.spawn("hdiutil", {
args: ["detach", mountPath, "-quiet"],
});
debugFetcher(`Unmounting ${mountPath}`);
const status = await proc.status();
proc.close();
assert(status.success, "unmounting failed");
assert(output.status.success, "unmounting failed");
}
}
}
Expand Down