30e992dec4
* chore: bump chromium in DEPS to 115.0.5772.0
* chore: update disable_color_correct_rendering.patch
no manual changes; patch succeeded with fuzz 2.
* chore: update chromium/build_libc_as_static_library.patch
no manual changes; patch succeeded with fuzz 2 (offset 1 line).
* chore: update chromium/feat_configure_launch_options_for_service_process.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4518747
patch manually reapplied due to upstream code shear
* chore: update chromium/chore_patch_out_profile_methods_in_profile_selections_cc.patch
https://chromium-review.googlesource.com/c/chromium/src/+/4502965
patch manually reapplied due to upstream code shear
* chore: update bundle_locations #include location
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4525355
* chore: Remove `extension_name` from DesktopStreamsRegistry
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4514081
* chore: bump chromium in DEPS to 115.0.5778.0
* chore: add chromium/chore_patch_out_profile_methods_in_chrome_browser_pdf.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4482679
Another instance of patching out upstream references to Profile code
* refactor: add WebViewGuestDelegate::GetGuestDelegateWeakPtr()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4515455
This approach copied from GuestViewBase::GetGuestDelegateWeakPtr() approach in that same commit.
* fixup! chore: update bundle_locations #include location
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4525355
Sync namespace use to upstream base::mac -> base::apple changes
* fixup! chore: update bundle_locations #include location
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4525355
Sync namespace use to upstream base::mac -> base::apple changes
* chore: update chromium/mas_disable_remote_accessibility.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4530546
patch manually reapplied due to upstream code shear
* chore: update chromium/printing.patch
no manual changes; patch succeeded with fuzz
* chore: update chromium/build_add_electron_tracing_category.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4517872
no manual changes; patch succeeded with fuzz
* chore: update chromium/feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4529098
patch manually reapplied due to upstream code shear
* chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
https://chromium-review.googlesource.com/c/chromium/src/+/4529098
patch manually reapplied due to upstream code shear
* chore: update chromium/mas-cgdisplayusesforcetogray.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4529475
no manual changes; patch succeeded with fuzz
* chore: update chromium/build_only_use_the_mas_build_config_in_the_required_components.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4429011
no manual changes; patch succeeded with fuzz
* chore: remove chromium/cherry-pick-48a136e77e6d.patch
already present upstream
* chore: remove chromium/cherry-pick-e6e23ba00379.patch
already present upstream
* [Code Health] Remove value based RegisterPref for Dict and List
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4533537
* Remove `cxx17_backports.h` and adjust unittest file
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4534916
Notes: mostly just removing #include and s/base::clamp/std::clamp/
* refactor: add FakeBrowserProcess helper class
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4424072
Used in ElectronBrowserMainParts' fake_browser_process_ field. Previously
this was an BrowserProcessImpl instance, but upstream 4424072 makes that
an abstract base class. `FakeBrowserProcess` is a thin subclass with the
minimum code needed to make it concrete.
`ElectronBrowserMainParts::fake_browser_process_` is now a `shared_ptr`
instead of a `unique_ptr` so we can avoid exposing `FakeBrowserProcess`
in the header.
* fixup! refactor: add FakeBrowserProcess helper class
remove unnecessary unique_ptr
* fix: Browser::SetDockIcon() when !Browser.is_ready()
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4410741
An alternative fix for https://github.com/electron/electron/pull/36279 .
The previous fix was to call `SetSupportedScales()` ourselves (1b1609a
),
but upstream has removed this API.
CC @codebytere
* fixup! chore: remove chromium/cherry-pick-e6e23ba00379.patch
* chore: update chromium/export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4517404
patch manually reapplied due to upstream code shear
* chore: update patches
* chore: add dep: resource_coordinator:mojo_bindings
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4521464
* fixup! chore: add dep: resource_coordinator:mojo_bindings
chore: make lint happy
* chore: patch out Profile methods in titlebar_config
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4508143 (primary)
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4534461 (followup)
* chore: bump chromium in DEPS to 115.0.5780.0
* chore: update chromium/disable_hidden.patch
no manual changes; patch succeeded with fuzz
* chore: update chromium/sysroot.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4535715
no manual changes; patch succeeded with fuzz
* chore: update chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4403623
patch manually reapplied due to upstream code shear
* chore: update chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4547380
patch manually reapplied due to upstream code shear
* chore: update patches
* fixup! fix: Browser::SetDockIcon() when !Browser.is_ready()
chore: iwyu image.h
* chore: bump chromium in DEPS to 115.0.5782.0
* chore: bump chromium in DEPS to 115.0.5784.0
* 4514181: CR2023: Update filled cr-input styles.
https://chromium-review.googlesource.com/c/chromium/src/+/4514181
* 4521894: Remove SiteInstanceDeleting usage outside of tests.
https://chromium-review.googlesource.com/c/chromium/src/+/4521894
* 4525355: Move backup_util and bundle_locations to base/apple
https://chromium-review.googlesource.com/c/chromium/src/+/4525355
* 4484743: webauthn: add underlying support for calling iCloud Keychain on macOS.
https://chromium-review.googlesource.com/c/chromium/src/+/4484743
* chore: fixup patch indices
* 4546398: Convert /chrome/browser to use ARC
https://chromium-review.googlesource.com/c/chromium/src/+/4546398
* chore: bump chromium in DEPS to 115.0.5786.0
* chore: update patches
* 4540682: Initialize PDF SDK with policy in chrome_pdf::RenderPDFPageToDC()
https://chromium-review.googlesource.com/c/chromium/src/+/4540682
* Don't import ObjC++ fn headers into electron_api_app
* 4535715: Refactor sysroot-creator.sh
https://chromium-review.googlesource.com/c/chromium/src/+/4535715
* fixup! refactor: add FakeBrowserProcess helper class
* 4531903: [string][test] Create/Copy strings to old space before externalization
https://chromium-review.googlesource.com/c/v8/v8/+/4531903
* 59645: Add APIs to support RSA keys with large e.
https://boringssl-review.googlesource.com/c/boringssl/+/59645
---------
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
472 lines
16 KiB
Text
472 lines
16 KiB
Text
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#import "shell/browser/ui/cocoa/electron_bundle_mover.h"
|
|
|
|
#import <AppKit/AppKit.h>
|
|
#import <Security/Security.h>
|
|
#import <dlfcn.h>
|
|
#import <sys/mount.h>
|
|
#import <sys/param.h>
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "gin/dictionary.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<electron::BundlerMoverConflictType> {
|
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
|
electron::BundlerMoverConflictType value) {
|
|
switch (value) {
|
|
case electron::BundlerMoverConflictType::kExists:
|
|
return gin::StringToV8(isolate, "exists");
|
|
case electron::BundlerMoverConflictType::kExistsAndRunning:
|
|
return gin::StringToV8(isolate, "existsAndRunning");
|
|
default:
|
|
return gin::StringToV8(isolate, "");
|
|
}
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace {
|
|
|
|
NSString* ContainingDiskImageDevice(NSString* bundlePath) {
|
|
NSString* containingPath = [bundlePath stringByDeletingLastPathComponent];
|
|
|
|
struct statfs fs;
|
|
if (statfs([containingPath fileSystemRepresentation], &fs) ||
|
|
(fs.f_flags & MNT_ROOTFS))
|
|
return nil;
|
|
|
|
NSString* device = [[NSFileManager defaultManager]
|
|
stringWithFileSystemRepresentation:fs.f_mntfromname
|
|
length:strlen(fs.f_mntfromname)];
|
|
|
|
NSTask* hdiutil = [[[NSTask alloc] init] autorelease];
|
|
[hdiutil setLaunchPath:@"/usr/bin/hdiutil"];
|
|
[hdiutil setArguments:[NSArray arrayWithObjects:@"info", @"-plist", nil]];
|
|
[hdiutil setStandardOutput:[NSPipe pipe]];
|
|
[hdiutil launch];
|
|
[hdiutil waitUntilExit];
|
|
|
|
NSData* data =
|
|
[[[hdiutil standardOutput] fileHandleForReading] readDataToEndOfFile];
|
|
|
|
NSDictionary* info =
|
|
[NSPropertyListSerialization propertyListWithData:data
|
|
options:NSPropertyListImmutable
|
|
format:NULL
|
|
error:NULL];
|
|
|
|
if (![info isKindOfClass:[NSDictionary class]])
|
|
return nil;
|
|
|
|
NSArray* images = (NSArray*)[info objectForKey:@"images"];
|
|
if (![images isKindOfClass:[NSArray class]])
|
|
return nil;
|
|
|
|
for (NSDictionary* image in images) {
|
|
if (![image isKindOfClass:[NSDictionary class]])
|
|
return nil;
|
|
|
|
id systemEntities = [image objectForKey:@"system-entities"];
|
|
if (![systemEntities isKindOfClass:[NSArray class]])
|
|
return nil;
|
|
|
|
for (NSDictionary* systemEntity in systemEntities) {
|
|
if (![systemEntity isKindOfClass:[NSDictionary class]])
|
|
return nil;
|
|
|
|
NSString* devEntry = [systemEntity objectForKey:@"dev-entry"];
|
|
if (![devEntry isKindOfClass:[NSString class]])
|
|
return nil;
|
|
|
|
if ([devEntry isEqualToString:device])
|
|
return device;
|
|
}
|
|
}
|
|
|
|
return nil;
|
|
}
|
|
|
|
NSString* ResolvePath(NSString* path) {
|
|
NSString* standardizedPath = [path stringByStandardizingPath];
|
|
char resolved[PATH_MAX];
|
|
if (realpath([standardizedPath UTF8String], resolved) == NULL)
|
|
return path;
|
|
return @(resolved);
|
|
}
|
|
|
|
bool IsInApplicationsFolder(NSString* bundlePath) {
|
|
// Check all the normal Application directories
|
|
NSArray* applicationDirs = NSSearchPathForDirectoriesInDomains(
|
|
NSApplicationDirectory, NSAllDomainsMask, true);
|
|
NSString* resolvedBundlePath = ResolvePath(bundlePath);
|
|
for (NSString* appDir in applicationDirs) {
|
|
if ([resolvedBundlePath hasPrefix:appDir])
|
|
return true;
|
|
}
|
|
|
|
// Also, handle the case that the user has some other Application directory
|
|
// (perhaps on a separate data partition).
|
|
if ([[resolvedBundlePath pathComponents] containsObject:@"Applications"])
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
bool AuthorizedInstall(NSString* srcPath, NSString* dstPath, bool* canceled) {
|
|
if (canceled)
|
|
*canceled = false;
|
|
|
|
// Make sure that the destination path is an app bundle. We're essentially
|
|
// running 'sudo rm -rf' so we really don't want to screw this up.
|
|
if (![[dstPath pathExtension] isEqualToString:@"app"])
|
|
return false;
|
|
|
|
// Do some more checks
|
|
if ([[dstPath stringByTrimmingCharactersInSet:[NSCharacterSet
|
|
whitespaceCharacterSet]]
|
|
length] == 0)
|
|
return false;
|
|
if ([[srcPath stringByTrimmingCharactersInSet:[NSCharacterSet
|
|
whitespaceCharacterSet]]
|
|
length] == 0)
|
|
return false;
|
|
|
|
int pid, status;
|
|
AuthorizationRef myAuthorizationRef;
|
|
|
|
// Get the authorization
|
|
OSStatus err =
|
|
AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment,
|
|
kAuthorizationFlagDefaults, &myAuthorizationRef);
|
|
if (err != errAuthorizationSuccess)
|
|
return false;
|
|
|
|
AuthorizationItem myItems = {kAuthorizationRightExecute, 0, NULL, 0};
|
|
AuthorizationRights myRights = {1, &myItems};
|
|
AuthorizationFlags myFlags =
|
|
(AuthorizationFlags)(kAuthorizationFlagInteractionAllowed |
|
|
kAuthorizationFlagExtendRights |
|
|
kAuthorizationFlagPreAuthorize);
|
|
|
|
err = AuthorizationCopyRights(myAuthorizationRef, &myRights, NULL, myFlags,
|
|
NULL);
|
|
if (err != errAuthorizationSuccess) {
|
|
if (err == errAuthorizationCanceled && canceled)
|
|
*canceled = true;
|
|
goto fail;
|
|
}
|
|
|
|
static OSStatus (*security_AuthorizationExecuteWithPrivileges)(
|
|
AuthorizationRef authorization, const char* pathToTool,
|
|
AuthorizationFlags options, char* const* arguments,
|
|
FILE** communicationsPipe) = NULL;
|
|
if (!security_AuthorizationExecuteWithPrivileges) {
|
|
// On 10.7, AuthorizationExecuteWithPrivileges is deprecated. We want to
|
|
// still use it since there's no good alternative (without requiring code
|
|
// signing). We'll look up the function through dyld and fail if it is no
|
|
// longer accessible. If Apple removes the function entirely this will fail
|
|
// gracefully. If they keep the function and throw some sort of exception,
|
|
// this won't fail gracefully, but that's a risk we'll have to take for now.
|
|
security_AuthorizationExecuteWithPrivileges = (OSStatus(*)(
|
|
AuthorizationRef, const char*, AuthorizationFlags, char* const*,
|
|
FILE**))dlsym(RTLD_DEFAULT, "AuthorizationExecuteWithPrivileges");
|
|
}
|
|
if (!security_AuthorizationExecuteWithPrivileges)
|
|
goto fail;
|
|
|
|
// Delete the destination
|
|
{
|
|
char rf[] = "-rf";
|
|
char* args[] = {rf, (char*)[dstPath fileSystemRepresentation], NULL};
|
|
err = security_AuthorizationExecuteWithPrivileges(
|
|
myAuthorizationRef, "/bin/rm", kAuthorizationFlagDefaults, args, NULL);
|
|
if (err != errAuthorizationSuccess)
|
|
goto fail;
|
|
|
|
// Wait until it's done
|
|
pid = wait(&status);
|
|
if (pid == -1 || !WIFEXITED(status))
|
|
goto fail; // We don't care about exit status as the destination most
|
|
// likely does not exist
|
|
}
|
|
|
|
// Copy
|
|
{
|
|
char pR[] = "-pR";
|
|
char* args[] = {pR, (char*)[srcPath fileSystemRepresentation],
|
|
(char*)[dstPath fileSystemRepresentation], NULL};
|
|
err = security_AuthorizationExecuteWithPrivileges(
|
|
myAuthorizationRef, "/bin/cp", kAuthorizationFlagDefaults, args, NULL);
|
|
if (err != errAuthorizationSuccess)
|
|
goto fail;
|
|
|
|
// Wait until it's done
|
|
pid = wait(&status);
|
|
if (pid == -1 || !WIFEXITED(status) || WEXITSTATUS(status))
|
|
goto fail;
|
|
}
|
|
|
|
AuthorizationFree(myAuthorizationRef, kAuthorizationFlagDefaults);
|
|
return true;
|
|
|
|
fail:
|
|
AuthorizationFree(myAuthorizationRef, kAuthorizationFlagDefaults);
|
|
return false;
|
|
}
|
|
|
|
bool CopyBundle(NSString* srcPath, NSString* dstPath) {
|
|
NSFileManager* fileManager = [NSFileManager defaultManager];
|
|
NSError* error = nil;
|
|
|
|
return [fileManager copyItemAtPath:srcPath toPath:dstPath error:&error];
|
|
}
|
|
|
|
NSString* ShellQuotedString(NSString* string) {
|
|
return [NSString
|
|
stringWithFormat:@"'%@'",
|
|
[string stringByReplacingOccurrencesOfString:@"'"
|
|
withString:@"'\\''"]];
|
|
}
|
|
|
|
void Relaunch(NSString* destinationPath) {
|
|
// The shell script waits until the original app process terminates.
|
|
// This is done so that the relaunched app opens as the front-most app.
|
|
int pid = [[NSProcessInfo processInfo] processIdentifier];
|
|
|
|
// Command run just before running open /final/path
|
|
NSString* preOpenCmd = @"";
|
|
|
|
NSString* quotedDestinationPath = ShellQuotedString(destinationPath);
|
|
|
|
// Before we launch the new app, clear xattr:com.apple.quarantine to avoid
|
|
// duplicate "scary file from the internet" dialog.
|
|
preOpenCmd = [NSString
|
|
stringWithFormat:@"/usr/bin/xattr -d -r com.apple.quarantine %@",
|
|
quotedDestinationPath];
|
|
|
|
NSString* script =
|
|
[NSString stringWithFormat:
|
|
@"(while /bin/kill -0 %d >&/dev/null; do /bin/sleep 0.1; "
|
|
@"done; %@; /usr/bin/open %@) &",
|
|
pid, preOpenCmd, quotedDestinationPath];
|
|
|
|
[NSTask
|
|
launchedTaskWithLaunchPath:@"/bin/sh"
|
|
arguments:[NSArray arrayWithObjects:@"-c", script, nil]];
|
|
}
|
|
|
|
bool Trash(NSString* path) {
|
|
bool result = false;
|
|
|
|
if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_8) {
|
|
result = [[NSFileManager defaultManager]
|
|
trashItemAtURL:[NSURL fileURLWithPath:path]
|
|
resultingItemURL:NULL
|
|
error:NULL];
|
|
}
|
|
|
|
// As a last resort try trashing with AppleScript.
|
|
// This allows us to trash the app in macOS Sierra even when the app is
|
|
// running inside an app translocation image.
|
|
if (!result) {
|
|
auto* code = R"str(
|
|
set theFile to POSIX file "%@"
|
|
tell application "Finder"
|
|
move theFile to trash
|
|
end tell
|
|
)str";
|
|
NSAppleScript* appleScript = [[[NSAppleScript alloc]
|
|
initWithSource:[NSString stringWithFormat:@(code), path]] autorelease];
|
|
NSDictionary* errorDict = nil;
|
|
NSAppleEventDescriptor* scriptResult =
|
|
[appleScript executeAndReturnError:&errorDict];
|
|
result = (scriptResult != nil);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
bool DeleteOrTrash(NSString* path) {
|
|
NSError* error;
|
|
|
|
if ([[NSFileManager defaultManager] removeItemAtPath:path error:&error]) {
|
|
return true;
|
|
} else {
|
|
return Trash(path);
|
|
}
|
|
}
|
|
|
|
bool IsApplicationAtPathRunning(NSString* bundlePath) {
|
|
bundlePath = [bundlePath stringByStandardizingPath];
|
|
|
|
for (NSRunningApplication* runningApplication in
|
|
[[NSWorkspace sharedWorkspace] runningApplications]) {
|
|
NSString* runningAppBundlePath =
|
|
[[[runningApplication bundleURL] path] stringByStandardizingPath];
|
|
if ([runningAppBundlePath isEqualToString:bundlePath]) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
bool ElectronBundleMover::ShouldContinueMove(gin_helper::ErrorThrower thrower,
|
|
BundlerMoverConflictType type,
|
|
gin::Arguments* args) {
|
|
gin::Dictionary options(args->isolate());
|
|
bool hasOptions = args->GetNext(&options);
|
|
base::OnceCallback<v8::Local<v8::Value>(BundlerMoverConflictType)>
|
|
conflict_cb;
|
|
|
|
if (hasOptions && options.Get("conflictHandler", &conflict_cb)) {
|
|
v8::Local<v8::Value> value = std::move(conflict_cb).Run(type);
|
|
if (value->IsBoolean()) {
|
|
if (!value.As<v8::Boolean>()->Value())
|
|
return false;
|
|
} else if (!value->IsUndefined()) {
|
|
// we only want to throw an error if a user has returned a non-boolean
|
|
// value; this allows for client-side error handling should something in
|
|
// the handler throw
|
|
thrower.ThrowError("Invalid conflict handler return type.");
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool ElectronBundleMover::Move(gin_helper::ErrorThrower thrower,
|
|
gin::Arguments* args) {
|
|
// Path of the current bundle
|
|
NSString* bundlePath = [[NSBundle mainBundle] bundlePath];
|
|
|
|
// Skip if the application is already in the Applications folder
|
|
if (IsInApplicationsFolder(bundlePath))
|
|
return true;
|
|
|
|
NSFileManager* fileManager = [NSFileManager defaultManager];
|
|
|
|
NSString* diskImageDevice = ContainingDiskImageDevice(bundlePath);
|
|
|
|
NSString* applicationsDirectory = [[NSSearchPathForDirectoriesInDomains(
|
|
NSApplicationDirectory, NSLocalDomainMask, true) lastObject]
|
|
stringByResolvingSymlinksInPath];
|
|
NSString* bundleName = [bundlePath lastPathComponent];
|
|
NSString* destinationPath =
|
|
[applicationsDirectory stringByAppendingPathComponent:bundleName];
|
|
|
|
// Check if we can write to the applications directory
|
|
// and then make sure that if the app already exists we can overwrite it
|
|
bool needAuthorization =
|
|
![fileManager isWritableFileAtPath:applicationsDirectory] ||
|
|
([fileManager fileExistsAtPath:destinationPath] &&
|
|
![fileManager isWritableFileAtPath:destinationPath]);
|
|
|
|
// Activate app -- work-around for focus issues related to "scary file from
|
|
// internet" OS dialog.
|
|
if (![NSApp isActive]) {
|
|
[NSApp activateIgnoringOtherApps:true];
|
|
}
|
|
|
|
// Move to applications folder
|
|
if (needAuthorization) {
|
|
bool authorizationCanceled;
|
|
|
|
if (!AuthorizedInstall(bundlePath, destinationPath,
|
|
&authorizationCanceled)) {
|
|
if (authorizationCanceled) {
|
|
// User rejected the authorization request
|
|
thrower.ThrowError("User rejected the authorization request");
|
|
return false;
|
|
} else {
|
|
thrower.ThrowError(
|
|
"Failed to copy to applications directory even with authorization");
|
|
return false;
|
|
}
|
|
}
|
|
} else {
|
|
// If a copy already exists in the Applications folder, put it in the Trash
|
|
if ([fileManager fileExistsAtPath:destinationPath]) {
|
|
// But first, make sure that it's not running
|
|
if (IsApplicationAtPathRunning(destinationPath)) {
|
|
// Check for callback handler and get user choice for open/quit
|
|
if (!ShouldContinueMove(
|
|
thrower, BundlerMoverConflictType::kExistsAndRunning, args))
|
|
return false;
|
|
|
|
// Unless explicitly denied, give running app focus and terminate self
|
|
[[NSTask
|
|
launchedTaskWithLaunchPath:@"/usr/bin/open"
|
|
arguments:[NSArray
|
|
arrayWithObject:destinationPath]]
|
|
waitUntilExit];
|
|
electron::Browser::Get()->Quit();
|
|
return true;
|
|
} else {
|
|
// Check callback handler and get user choice for app trashing
|
|
if (!ShouldContinueMove(thrower, BundlerMoverConflictType::kExists,
|
|
args))
|
|
return false;
|
|
|
|
// Unless explicitly denied, attempt to trash old app
|
|
if (!Trash([applicationsDirectory
|
|
stringByAppendingPathComponent:bundleName])) {
|
|
thrower.ThrowError("Failed to delete existing application");
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!CopyBundle(bundlePath, destinationPath)) {
|
|
thrower.ThrowError(
|
|
"Failed to copy current bundle to the applications folder");
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// Trash the original app. It's okay if this fails.
|
|
// NOTE: This final delete does not work if the source bundle is in a network
|
|
// mounted volume.
|
|
// Calling rm or file manager's delete method doesn't work either. It's
|
|
// unlikely to happen but it'd be great if someone could fix this.
|
|
if (diskImageDevice == nil && !DeleteOrTrash(bundlePath)) {
|
|
// Could not delete original but we just don't care
|
|
}
|
|
|
|
// Relaunch.
|
|
Relaunch(destinationPath);
|
|
|
|
// Launched from within a disk image? -- unmount (if no files are open after 5
|
|
// seconds, otherwise leave it mounted).
|
|
if (diskImageDevice) {
|
|
NSString* script = [NSString
|
|
stringWithFormat:@"(/bin/sleep 5 && /usr/bin/hdiutil detach %@) &",
|
|
ShellQuotedString(diskImageDevice)];
|
|
[NSTask launchedTaskWithLaunchPath:@"/bin/sh"
|
|
arguments:[NSArray arrayWithObjects:@"-c", script,
|
|
nil]];
|
|
}
|
|
|
|
electron::Browser::Get()->Quit();
|
|
|
|
return true;
|
|
}
|
|
|
|
bool ElectronBundleMover::IsCurrentAppInApplicationsFolder() {
|
|
return IsInApplicationsFolder([[NSBundle mainBundle] bundlePath]);
|
|
}
|
|
|
|
} // namespace electron
|