From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Apr 2021 15:15:43 +0000 (+0100)
Subject: Makefile: Try flailing for inkscape extension python fail
X-Git-Tag: otter-0.5.0~43
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=aa63c98b422e94ccb83ab5a7f1c9a352a8c12505;p=otter.git

Makefile: Try flailing for inkscape extension python fail

Reported-by: Matthew Vernon <matthewv@chiark.greenend.org.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index 57352460..4c35aa00 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ INKSCAPE ?= inkscape
 # inkscape 1.0.2: --system-data-directory, no --extension-directory
 INKSCAPE_EXTENSIONS := $(shell set -e; { sdd=$$( $(INKSCAPE) --system-data-directory ) && echo "$$sdd/extensions"; } || $(INKSCAPE) --extension-directory )
 endif
-RECOLOUR_SVG ?= $(INKSCAPE_EXTENSIONS)/color_replace.py
+RECOLOUR_SVG ?= ./run-inkscape-extension $(INKSCAPE_EXTENSIONS)/color_replace.py
 
 DEPLOY_ARCH=x86_64-unknown-linux-musl
 DEPLOY_RELEASE=debug
diff --git a/run-inkscape-extension b/run-inkscape-extension
new file mode 100755
index 00000000..4e1c94a6
--- /dev/null
+++ b/run-inkscape-extension
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# inkscape 0.92.4 on Debian buster:
+# These scripts are perfectly good scripts; they are executable,
+# and they work with the #! that is provided.  They do not work with
+# python2.
+#
+# inkscape 1.0.2 on Debian bullseye:
+# These files are not executable.  They say #!/usr/bin/env python
+# but the system probably doesn't have any such thing, because
+# that would (on a sane system) refer to python2 and there is
+# only python3.
+#
+# I don't think it is going to be possible to sanely find out what
+# python version is actually expected.  But I think a *reasonable*
+# demand on the environment is that either:
+#   - These if these scripts are executable, they can be executed
+#   - Otherwise, they are not using ancient and obsolete python
+
+$(
+  if test -x "$1"; then :; else
+    type -p python3 || type -p python
+  fi
+) "$@"