[adwaita-icon-theme: 1/3] Use system inkscape if flatpak version is not available
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [adwaita-icon-theme: 1/3] Use system inkscape if flatpak version is not available
- Date: Tue, 23 Nov 2021 22:28:14 +0000 (UTC)
commit 77b4c2eee26edbe5bbd486cc685662ff3099a6f8
Author: Leandro Guedes <leandroguedes protonmail com>
Date: Thu Nov 18 18:29:06 2021 -0300
Use system inkscape if flatpak version is not available
render-icon-theme.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/render-icon-theme.py b/render-icon-theme.py
index 51a75ba4..987f94bb 100755
--- a/render-icon-theme.py
+++ b/render-icon-theme.py
@@ -8,6 +8,7 @@ import subprocess
OPTIPNG = '/usr/bin/optipng'
ZOPFLIPNG = '/usr/bin/zopflipng'
SRC = os.path.join('.', 'src', 'fullcolor')
+INKSCAPE_PREFIX = ['flatpak','run','org.inkscape.Inkscape']
inkscape_process = None
@@ -36,7 +37,8 @@ def wait_for_prompt(process, command=None):
def inkscape_render_rect(icon_file, rect, output_file):
#print("flatpak run org.inkscape.Inkscape --batch-process -i %s --export-type=png -o %s %s" % (rect,
output_file,icon_file));
- subprocess.run(['flatpak','run','org.inkscape.Inkscape', '--batch-process', '-i', rect,
'--export-type=png', '-o', output_file, icon_file])
+ commandline_sulfix = ['--batch-process', '-i', rect, '--export-type=png', '-o', output_file, icon_file]
+ subprocess.run(INKSCAPE_PREFIX + commandline_sulfix)
optimize_png(output_file)
class ContentHandler(xml.sax.ContentHandler):
@@ -140,6 +142,15 @@ class ContentHandler(xml.sax.ContentHandler):
def characters(self, chars):
self.chars += chars.strip()
+if subprocess.run(['flatpak', 'info', '--show-ref', 'org.inkscape.Inkscape']).returncode != 0:
+ try:
+ subprocess.run(['inkscape', '--version'])
+ except FileNotFoundError:
+ print("Inkscape is required for this script")
+ exit()
+
+ INKSCAPE_PREFIX = ['inkscape']
+
if len(sys.argv) == 1:
if not os.path.exists('Adwaita'):
os.mkdir('Adwaita')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]