flatpak: refine build; install more executables in image

zed-industries · Aug 3, 2022 · c0ebd2d · c0ebd2d
1 parent 404d742
commit c0ebd2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/assets/flatpak/org.wezfurlong.wezterm.json b/assets/flatpak/org.wezfurlong.wezterm.json
@@ -32,7 +32,6 @@
                 }
             },
             "build-commands": [
-                "pwd",
                 "cargo --offline fetch --manifest-path Cargo.toml --verbose",
                 "cargo --offline build --release --verbose",
                 "mkdir -p /app/share/icons/hicolor/128x128/apps/",
@@ -42,8 +41,13 @@
                 "mkdir -p /app/share/applications/",
                 "cp ./assets/wezterm.desktop /app/share/applications/org.wezfurlong.wezterm.desktop",
                 "install -Dm755 ./target/release/wezterm -t /app/bin/",
-                "install -Dm755 ./target/release/wezterm-gui -t /app/bin/"
-            ],
+                "install -Dm755 ./target/release/wezterm-gui -t /app/bin/",
+                "install -Dm755 ./target/release/wezterm-mux-server -t /app/bin/",
+                "install -Dm755 ./target/release/strip-ansi-escapes -t /app/bin/",
+                "install -Dm644 assets/shell-integration/* -t /app/extra/export/share/etc/profile.d",
+                "install -Dm644 assets/shell-completion/zsh /app/extra/export/share/zsh/site-functions/_wezterm",
+                "install -Dm644 assets/shell-completion/bash /app/extra/export/share/etc/bash_completion.d/wezterm"
+              ],
             "sources": [
                 {
                     "type": "dir",

diff --git a/ci/flatpak.sh b/ci/flatpak.sh
@@ -7,4 +7,4 @@ flatpak install --noninteractive --user flathub org.freedesktop.Platform//21.08
 python3 -m pip install toml aiohttp
 curl -L 'https://github.com/flatpak/flatpak-builder-tools/raw/master/cargo/flatpak-cargo-generator.py' > /tmp/flatpak-cargo-generator.py
 python3 /tmp/flatpak-cargo-generator.py Cargo.lock -o assets/flatpak/generated-sources.json
-flatpak-builder --install repo assets/flatpak/org.wezfurlong.wezterm.json --force-clean --user -y
+flatpak-builder --state-dir /var/tmp/wezterm-flatpak-builder --install /var/tmp/wezterm-flatpak-repo assets/flatpak/org.wezfurlong.wezterm.json --force-clean --user -y