Merge pull request #342 from zothar/local_user_install

Local user install: terminator.desktop and terminator.metainfo.xml
This commit is contained in:
Matt Rose 2020-12-30 16:23:30 -05:00 committed by GitHub
commit 75ce41117f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions

View File

@ -69,20 +69,24 @@ class BuildData(build):
INTLTOOL_MERGE='intltool-merge' INTLTOOL_MERGE='intltool-merge'
desktop_in='data/terminator.desktop.in' desktop_in='data/terminator.desktop.in'
desktop_data='data/terminator.desktop' desktop_data='data/terminator.desktop'
rc = None
if not self.distribution.without_gettext:
rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -d -u -c " + TOP_BUILDDIR + rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -d -u -c " + TOP_BUILDDIR +
"/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " + "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
desktop_in + " " + desktop_data) desktop_in + " " + desktop_data)
if rc != 0: if self.distribution.without_gettext or rc != 0:
# run the desktop_in through a command to strip the "_" characters # run the desktop_in through a command to strip the "_" characters
with open(desktop_in) as file_in, open(desktop_data, 'w') as file_data: with open(desktop_in) as file_in, open(desktop_data, 'w') as file_data:
[file_data.write(line.lstrip('_')) for line in file_in] [file_data.write(line.lstrip('_')) for line in file_in]
appdata_in='data/terminator.appdata.xml.in' appdata_in='data/terminator.appdata.xml.in'
appdata_data='data/terminator.metainfo.xml' appdata_data='data/terminator.metainfo.xml'
rc = None
if not self.distribution.without_gettext:
rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR + rc = os.system ("C_ALL=C " + INTLTOOL_MERGE + " -x -u -c " + TOP_BUILDDIR +
"/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " + "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
appdata_in + " " + appdata_data) appdata_in + " " + appdata_data)
if rc != 0: if self.distribution.without_gettext or rc != 0:
# run the appdata_in through a command to strip the "_" characters # run the appdata_in through a command to strip the "_" characters
with open(appdata_in) as file_in, open(appdata_data, 'w') as file_data: with open(appdata_in) as file_in, open(appdata_data, 'w') as file_data:
[file_data.write(line.replace('<_','<').replace('</_','</')) for line in file_in] [file_data.write(line.replace('<_','<').replace('</_','</')) for line in file_in]