From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 24 Nov 2024 22:19:01 +0000 (+0100)
Subject: mkosi: Make sure mkosi.clangd always runs on the host
X-Git-Tag: v257-rc3~35
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=0e44a351ea8a6ebb63acaa9c6663656b16499ec6;p=systemd%2F.git

mkosi: Make sure mkosi.clangd always runs on the host

If the editor that invokes mkosi.clangd is a flatpak, let's make sure
that mkosi is run on the host and not in the flatpak sandbox since it
won't be installed there.
---

diff --git a/mkosi.clangd b/mkosi.clangd
index 8e54e44f70..7cd447c4ee 100755
--- a/mkosi.clangd
+++ b/mkosi.clangd
@@ -1,12 +1,18 @@
 #!/bin/bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-MKOSI_CONFIG="$(mkosi --json summary | jq -r .Images[-1])"
+if command -v flatpak-spawn >/dev/null; then
+    SPAWN=(flatpak-spawn --host)
+else
+    SPAWN=()
+fi
+
+MKOSI_CONFIG="$("${SPAWN[@]}" --host mkosi --json summary | jq -r .Images[-1])"
 DISTRIBUTION="$(jq -r .Distribution <<< "$MKOSI_CONFIG")"
 RELEASE="$(jq -r .Release <<< "$MKOSI_CONFIG")"
 ARCH="$(jq -r .Architecture <<< "$MKOSI_CONFIG")"
 
-exec mkosi \
+exec "${SPAWN[@]}" mkosi \
     --incremental=strict \
     --build-sources-ephemeral=no \
     --format=none \