diff --git a/packaging/.shellcheckrc b/packaging/.shellcheckrc new file mode 100644 index 00000000..36c19d06 --- /dev/null +++ b/packaging/.shellcheckrc @@ -0,0 +1,3 @@ +# shellcheck config for the packaging scripts (CI: .github/workflows/packaging-lint.yml). +source-path=SCRIPTDIR +external-sources=true diff --git a/packaging/macos/package.sh b/packaging/macos/package.sh index abd8e03b..d19d9805 100755 --- a/packaging/macos/package.sh +++ b/packaging/macos/package.sh @@ -97,7 +97,8 @@ plutil -lint "$MNT/SolveCraft.app/Contents/Info.plist" case "$ARCH" in universal) WANT=(arm64 x86_64) ;; aarch64) WANT=(arm64) ;; *) WANT=(x86_64) ;; esac lipo "$MNT/SolveCraft.app/Contents/MacOS/SolveCraft" -verify_arch "${WANT[@]}" test -s "$MNT/SolveCraft.app/Contents/Resources/Licenses/THIRD-PARTY-LICENSES.txt" -codesign --verify --strict --deep "$MNT/SolveCraft.app" +# Not --strict: the mounted HFS volume adds Finder info, which strict verification rejects. +codesign --verify --deep --verbose=2 "$MNT/SolveCraft.app" "$MNT/SolveCraft.app/Contents/MacOS/SolveCraft" --version hdiutil detach "$MNT" diff --git a/packaging/windows/solvecraft.wxs b/packaging/windows/solvecraft.wxs index 1f406ee9..27ec3846 100644 --- a/packaging/windows/solvecraft.wxs +++ b/packaging/windows/solvecraft.wxs @@ -110,7 +110,8 @@ - + +