3 files changed, 22 insertions, 5 deletions
diff --git a/context-mkiv/PKGBUILD b/context-mkiv/PKGBUILD
index 599bf95..e5df7e8 100644
--- a/context-mkiv/PKGBUILD
+++ b/context-mkiv/PKGBUILD
@@ -16,8 +16,8 @@ source=( \
   context-setup-env.sh \
   context-wrap-mtxrun.sh \
 )
-sha512sums=('92ede9be2a244a065cd133e7300d3c807c212e588eb164d941bb89eda9f72601101b754235bce06442e0e75793ce2de99053f094a8510811d4c8e84e9f445993'
-            '1151100c043c25c2a09f04ee1ef067a0f81a6f17aafb88446bb168242d70a069e8b0d351263df31fe02fa662660325dc568e96944ed06b2cf65a24e4a127a750')
+sha512sums=('f7b52dbede67e8c4a924e2700df93a843704045c3b00a17b593dbf7771ec7c857b48c7a6aa95c8bb4923a4c91e68adf63a6223f59c84c0fab3a6023ad0589aaa'
+            'aa3f9fd05f438965576ad57f5ad1bb2d873b672586f29716e0a2087bde0edc3d3ccf1d0c67b503eb3140dd0ff87bc5be3b9e627867e229cbcddb68cf0ba01099')
 
 # binaries and scripts installed with deps
 readonly _luatex=/usr/bin/texlua
@@ -65,6 +65,7 @@ package() {
   local execdst="${pkgdir}/usr/bin"
   local platformdst="${texdst}/texmf-linux/bin"
   local subdirs=( texmf texmf-fonts texmf-modules )
+
   cd context
   install -dm755 "${texdst}"
   for dir in ${subdirs[@]}; do
@@ -83,6 +84,18 @@ package() {
   install -Dm755 texmf-linux/bin/mktexlsr "${execdst}"
   install -dm755 "${libdst}"
   install -Dm644 "${srcdir}/context-setup-env.sh" "${libdst}"
+
+  ln -s /usr/bin/luatex "${platformdst}"
+  ln -s /usr/bin/luatex "${platformdst}/texlua"
+  ln -s /usr/bin/luatex "${platformdst}/texluac"
+
+  [ ! -d tmp ] && mkdir tmp
+  >tmp/context-wrap-context.sh cat <<STOPTHAT
+#!/usr/bin/env bash
+source "/usr/lib/context-setup-env.sh"
+mtxrun --script context "\$@"
+STOPTHAT
+  install -Dm755 tmp/context-wrap-context.sh "${execdst}/context"
 }
 
 # vim:et:ft=sh:sw=2:ts=8
diff --git a/context-mkiv/context-setup-env.sh b/context-mkiv/context-setup-env.sh
index 3672555..e8367f1 100644
--- a/context-mkiv/context-setup-env.sh
+++ b/context-mkiv/context-setup-env.sh
@@ -10,9 +10,13 @@ if [[ -d /usr/share/fonts ]]; then
 fi
 
 declare -x OSFONTDIR="${font_dirs:-}"
+declare -x TEXMF="{${context_root},${HOME}/.texmf}"
 declare -x TEXMFCACHE=${HOME}/.texmf/texmf-cache
-declare -x TEXMFCNF=/usr/share/texmf/texmf/web2c
-declare -x TEXOS=${context_root}/texmf-linux/bin
+declare -x TEXMFCNF=${context_root}/texmf/web2c
+# “platform” mingles architecture and OS so we neutralize it
+# to mean just the latter; that’s where the binaries go anyways.
+declare -x TEXOS=texmf-linux
 declare -x MTX_PLATFORM=linux
 
 # vim:et:ft=sh:sw=2:ts=8
+
diff --git a/context-mkiv/context-wrap-mtxrun.sh b/context-mkiv/context-wrap-mtxrun.sh
index b059181..3476c7a 100644
--- a/context-mkiv/context-wrap-mtxrun.sh
+++ b/context-mkiv/context-wrap-mtxrun.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 source /usr/lib/context-setup-env.sh
-exec /usr/share/texmf/texmf-linux/bin/mtxrun $@
+exec /usr/share/texmf/texmf-linux/bin/mtxrun "$@"