mirror of
https://github.com/spalencsar/bearwave.git
synced 2026-07-06 14:24:14 +02:00
fix: About dialog crash and flatpak build id (1.0.5 pkgrel 8)
Replace the tall ScrollView/license layout that crashed under KDE Dialog with a compact layout matching the other dialogs. Inject BEARWAVE_GIT_HASH into flatpak builds via manifest env (no .git in builder sandbox).
This commit is contained in:
@@ -19,20 +19,34 @@ for arg in "$@"; do
|
||||
esac
|
||||
done
|
||||
|
||||
git_hash="$(git -C "${root}" rev-parse --short HEAD 2>/dev/null || echo unknown)"
|
||||
build_manifest="${root}/.flatpak-builder-manifest.json"
|
||||
python3 - "${root}/de.nerdbear.bearwave.json" "${build_manifest}" "${git_hash}" <<'PY'
|
||||
import json, sys
|
||||
src, dst, git_hash = sys.argv[1], sys.argv[2], sys.argv[3]
|
||||
with open(src, encoding="utf-8") as f:
|
||||
manifest = json.load(f)
|
||||
module = manifest["modules"][0]
|
||||
module.setdefault("build-options", {}).setdefault("env", {})["BEARWAVE_GIT_HASH"] = git_hash
|
||||
with open(dst, "w", encoding="utf-8") as f:
|
||||
json.dump(manifest, f, indent=4)
|
||||
f.write("\n")
|
||||
PY
|
||||
|
||||
if [[ "${mode}" == "reexport" ]]; then
|
||||
flatpak-builder \
|
||||
--repo=flatpak_repo \
|
||||
--gpg-sign="${gpg_key_id}" \
|
||||
--export-only \
|
||||
flatpak_build \
|
||||
de.nerdbear.bearwave.json
|
||||
"${build_manifest}"
|
||||
else
|
||||
flatpak-builder \
|
||||
--repo=flatpak_repo \
|
||||
--gpg-sign="${gpg_key_id}" \
|
||||
--force-clean \
|
||||
flatpak_build \
|
||||
de.nerdbear.bearwave.json
|
||||
"${build_manifest}"
|
||||
fi
|
||||
|
||||
flatpak build-update-repo --gpg-sign="${gpg_key_id}" flatpak_repo
|
||||
|
||||
Reference in New Issue
Block a user