]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Make sure mkosi.clangd always runs on the host
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 24 Nov 2024 22:19:01 +0000 (23:19 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 24 Nov 2024 23:21:10 +0000 (00:21 +0100)
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.

mkosi.clangd

index 8e54e44f70973da304378ee2266cae55badf7f6b..7cd447c4ee923de1b96844e6beab3b38ae9ccfe0 100755 (executable)
@@ -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 \