162ece4227
https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/48.beta...48.rc Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service
|
|
index de91167c5..1c9965678 100644
|
|
--- a/data/org.gnome.Shell-disable-extensions.service
|
|
+++ b/data/org.gnome.Shell-disable-extensions.service
|
|
@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions
|
|
[Service]
|
|
Type=simple
|
|
# Disable extensions
|
|
-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
|
|
+ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
|
|
Restart=no
|
|
diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
|
|
index 53fd92846..89533cedc 100644
|
|
--- a/js/ui/extensionDownloader.js
|
|
+++ b/js/ui/extensionDownloader.js
|
|
@@ -124,7 +124,7 @@ async function extractExtensionArchive(bytes, dir) {
|
|
stream.close_async(GLib.PRIORITY_DEFAULT, null);
|
|
|
|
const unzip = Gio.Subprocess.new(
|
|
- ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
|
|
+ ['@unzip@', '-uod', dir.get_path(), '--', file.get_path()],
|
|
Gio.SubprocessFlags.NONE);
|
|
await unzip.wait_check_async(null);
|
|
|
|
@@ -146,7 +146,7 @@ async function extractExtensionArchive(bytes, dir) {
|
|
}
|
|
|
|
const compileSchema = Gio.Subprocess.new(
|
|
- ['glib-compile-schemas', '--strict', schemasPath.get_path()],
|
|
+ ['@glib_compile_schemas@', '--strict', schemasPath.get_path()],
|
|
Gio.SubprocessFlags.NONE);
|
|
|
|
try {
|
|
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
|
index 1b43e1051..a31b0a304 100644
|
|
--- a/js/ui/status/keyboard.js
|
|
+++ b/js/ui/status/keyboard.js
|
|
@@ -1104,6 +1104,6 @@ class InputSourceIndicator extends PanelMenu.Button {
|
|
_showLayout() {
|
|
Main.overview.hide();
|
|
|
|
- Util.spawn(['tecla']);
|
|
+ Util.spawn(['@tecla@']);
|
|
}
|
|
});
|
|
diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c
|
|
index 11fb4b6b7..e00e4807b 100644
|
|
--- a/subprojects/extensions-tool/src/command-install.c
|
|
+++ b/subprojects/extensions-tool/src/command-install.c
|
|
@@ -158,7 +158,7 @@ install_extension (const char *bundle,
|
|
|
|
schemapath = g_file_get_path (schemadir);
|
|
proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, &error,
|
|
- "glib-compile-schemas", "--strict", schemapath,
|
|
+ "@glib_compile_schemas@", "--strict", schemapath,
|
|
NULL);
|
|
|
|
if (!g_subprocess_wait_check (proc, NULL, &error))
|