[meld] bin/meld: Fix the resource file name to match what we build
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] bin/meld: Fix the resource file name to match what we build
- Date: Thu, 17 Jan 2019 23:43:31 +0000 (UTC)
commit 35aa803280782acf35cc00a35c57496b4018b3b3
Author: Kai Willadsen <kai willadsen gmail com>
Date: Fri Jan 18 09:40:07 2019 +1000
bin/meld: Fix the resource file name to match what we build
The build helpers built with the application ID, but the main script
built (and expected to find) the plain application name. Now they both
want the application ID.
bin/meld | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 3b8f967f..2d77d625 100755
--- a/bin/meld
+++ b/bin/meld
@@ -229,13 +229,14 @@ def setup_resources():
from gi.repository import Gdk
from gi.repository import GtkSource
- resource_file = os.path.join(meld.conf.DATADIR, "meld.gresource")
+ resource_filename = meld.conf.APPLICATION_ID + ".gresource"
+ resource_file = os.path.join(meld.conf.DATADIR, resource_filename)
if not os.path.exists(resource_file) and uninstalled:
subprocess.call(
[
"glib-compile-resources",
- "--target={}/meld.gresource".format(meld.conf.DATADIR),
+ "--target={}".format(resource_file),
"--sourcedir=meld/resources",
"meld/resources/meld.gresource.xml",
],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]