From 396f4d2fbc4346b23015cf4888864b71a60c77d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= Date: Tue, 8 Sep 2026 11:46:09 +0200 Subject: [PATCH] fix(package): resolve edition-suffixed Inno Setup output name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Research Edition patcher (#1434) rewrites OutputBaseFilename in both .iss files to activitywatch-research[-tauri]-setup, but package-all.sh still moved the hardcoded standard name — failing both Windows jobs on the v0.14.0b5-research tag build (mv: cannot stat). Glob the single produced setup exe instead, failing loudly if the count is ever not 1. --- scripts/package/package-all.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/package/package-all.sh b/scripts/package/package-all.sh index eaecdbc7e..29168cb15 100755 --- a/scripts/package/package-all.sh +++ b/scripts/package/package-all.sh @@ -107,7 +107,16 @@ function build_setup() { else env AW_VERSION=$version_no_prefix "$innosetupdir/iscc.exe" scripts/package/activitywatch-setup.iss fi - mv dist/activitywatch-setup.exe dist/$filename + # The Research Edition patcher rewrites OutputBaseFilename in the .iss + # (activitywatch-research[-tauri]-setup), so resolve the produced file + # instead of hardcoding the standard name. dist/ is fresh at this point, + # so exactly one setup exe must exist. + setup_src=(dist/activitywatch*-setup.exe) + if [ ${#setup_src[@]} -ne 1 ] || [ ! -f "${setup_src[0]}" ]; then + echo "ERROR: expected exactly one dist/activitywatch*-setup.exe, got: ${setup_src[*]}" + exit 1 + fi + mv "${setup_src[0]}" "dist/$filename" echo "Setup built!" }