Compare commits

...

2 Commits

Author SHA1 Message Date
Benjamin Berg
869f8f480c runDialog: Use new app based launch helper
Doing this has the advantage of using the GLib GDesktopAppInfo launching
API, resulting in the automatic registration of the application with
systemd.

See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1596
Closes: #3025

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1384
2020-07-31 17:11:24 +02:00
Benjamin Berg
4e54cbcc60 util: Add new trySpawnAppCommandline function
Add a new helper function to launch a command line as if it was an
application. This has the advantage of using the appropriate code paths
in GLib (and gnome-shell currently) to place the launched program into a
separate systemd scope.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1384
2020-07-31 17:10:15 +02:00
2 changed files with 41 additions and 10 deletions

View File

@ -1,7 +1,7 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
/* exported findUrls, spawn, spawnCommandLine, spawnApp, trySpawnCommandLine, /* exported findUrls, spawn, spawnCommandLine, spawnApp, trySpawnAppCommandline,
formatTime, formatTimeSpan, createTimeLabel, insertSorted, trySpawnCommandLine, formatTime, formatTimeSpan, createTimeLabel,
ensureActorVisibleInScrollView, wiggle */ insertSorted, ensureActorVisibleInScrollView, wiggle */
const { Clutter, Gio, GLib, Shell, St, GnomeDesktop } = imports.gi; const { Clutter, Gio, GLib, Shell, St, GnomeDesktop } = imports.gi;
const Gettext = imports.gettext; const Gettext = imports.gettext;
@ -86,17 +86,48 @@ function spawnCommandLine(commandLine) {
} }
} }
// trySpawnAppCommandline:
// @command: The command to spawn
//
// Runs @command as if it was an application, handling startup notification
// and placing it into a separate systemd scope.
function trySpawnAppCommandline(command) {
const quoted = command.replace(/%/g, '%%');
// This cannot fail currently
const app = Gio.AppInfo.create_from_commandline(quoted, null,
Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION);
// Launching applications does not check whether the executable exists,
// it'll just log an error later on. So do an explicit check here.
const exec = app.get_executable();
if (!GLib.find_program_in_path(exec)) {
throw new GLib.SpawnError({
code: GLib.SpawnError.NOENT,
message: _('Command not found'),
});
}
try {
let context = global.create_app_launch_context(0, -1);
app.launch([], context);
} catch (err) {
// Replace "Error invoking global.create_app_launch_context: " with
// something nicer
err.message = err.message.replace(/[^:]*: /, '%s\n'.format(_('Could not parse command:')));
throw err;
}
}
// spawnApp: // spawnApp:
// @argv: an argv array // @argv: an argv array
// //
// Runs @argv as if it was an application, handling startup notification // Runs @argv as if it was an application, handling startup notification
// and placing it into a separate systemd scope.
function spawnApp(argv) { function spawnApp(argv) {
try { try {
let app = Gio.AppInfo.create_from_commandline(argv.join(' '), null, trySpawnAppCommandline(argv.join(' '));
Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION);
let context = global.create_app_launch_context(0, -1);
app.launch([], context);
} catch (err) { } catch (err) {
_handleSpawnError(argv[0], err); _handleSpawnError(argv[0], err);
} }

View File

@ -196,7 +196,7 @@ class RunDialog extends ModalDialog.ModalDialog {
let execArg = this._terminalSettings.get_string(EXEC_ARG_KEY); let execArg = this._terminalSettings.get_string(EXEC_ARG_KEY);
command = '%s %s %s'.format(exec, execArg, input); command = '%s %s %s'.format(exec, execArg, input);
} }
Util.trySpawnCommandLine(command); Util.trySpawnAppCommandline(command);
} catch (e) { } catch (e) {
// Mmmh, that failed - see if @input matches an existing file // Mmmh, that failed - see if @input matches an existing file
let path = null; let path = null;