Skip to content

Commit 7e9d679

Browse files
committed
fix(obs): inject ATTRIBUTIONS.html into public/ inside source tarball
Vite copies public/ to dist/ during the React build. The prior fix injected ATTRIBUTIONS.html at the source root, so Vite never saw it and Tauri could not serve it via WebviewUrl::App. Inject into public/ so Vite copies it into the frontend dist, and add that path to the debian.rules wildcard for the install step.
1 parent 3c072c0 commit 7e9d679

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎packaging/obs/debian.rules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CARGO_VENDOR_ARCHIVE := $(firstword $(wildcard vendor.tar.xz ../vendor.tar.xz /u
77
NODE_MODULES_ARCHIVE := $(firstword $(wildcard node_modules.obscpio ../node_modules.obscpio /usr/src/packages/SOURCES/node_modules.obscpio))
88
NPM_TARBALLS_DIR := $(firstword $(wildcard /usr/src/packages/SOURCES))
99
DESKTOP_FILE := $(firstword $(wildcard com.cst8t.gitmun.desktop ../com.cst8t.gitmun.desktop /usr/src/packages/SOURCES/com.cst8t.gitmun.desktop))
10-
ATTRIBUTIONS_FILE := $(firstword $(wildcard ATTRIBUTIONS.html ../ATTRIBUTIONS.html /usr/src/packages/SOURCES/ATTRIBUTIONS.html))
10+
ATTRIBUTIONS_FILE := $(firstword $(wildcard public/ATTRIBUTIONS.html ATTRIBUTIONS.html ../ATTRIBUTIONS.html /usr/src/packages/SOURCES/ATTRIBUTIONS.html))
1111

1212
%:
1313
dh $@

‎scripts/obs/publish-release-package.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ mkdir -p "$render_dir"
3636
git -C "$repo_root" archive --format=tar --prefix="${release_root}/" HEAD | xz -T0 >"$source_tarball"
3737

3838
tar -xJf "$source_tarball" -C "$tmp_dir"
39-
cp "${input_dir}/ATTRIBUTIONS.html" "${tmp_dir}/${release_root}/"
39+
cp "${input_dir}/ATTRIBUTIONS.html" "${tmp_dir}/${release_root}/public/"
4040
cp "${input_dir}/commit-hash.txt" "${tmp_dir}/${release_root}/"
4141
rm "$source_tarball"
4242
tar -cJf "$source_tarball" -C "$tmp_dir" "$release_root"

0 commit comments

Comments
 (0)