300826
This commit is contained in:
@@ -101,6 +101,9 @@ package_appimage() {
|
||||
echo "Bundling libraries with linuxdeploy…"
|
||||
export APPIMAGE_EXTRACT_AND_RUN=1
|
||||
export OUTPUT="${IMAGE_NAME}"
|
||||
# Marker: mtime boundary to find the FRESH linuxdeploy output.
|
||||
local marker="${OUT_DIR}/.pack-start"
|
||||
touch "${marker}"
|
||||
(
|
||||
cd "${OUT_DIR}"
|
||||
"${linuxdeploy}" \
|
||||
@@ -111,11 +114,15 @@ package_appimage() {
|
||||
--output appimage
|
||||
)
|
||||
|
||||
# linuxdeploy drops the AppImage next to AppDir (dist/)
|
||||
# linuxdeploy drops the AppImage next to AppDir (dist/). Only consider files
|
||||
# NEWER than the marker: a blind `find | head -1` with several older
|
||||
# *.AppImage in dist/ renamed an OLD image OVER the freshly built one
|
||||
# (rcalc-0.1.28 got shipped with a 0.1.25 binary from the first build).
|
||||
local built
|
||||
built="$(find "${OUT_DIR}" -maxdepth 1 -name '*.AppImage' ! -name 'linuxdeploy*' | head -1)"
|
||||
built="$(find "${OUT_DIR}" -maxdepth 1 -name '*.AppImage' ! -name 'linuxdeploy*' -newer "${marker}" | head -1)"
|
||||
rm -f "${marker}"
|
||||
if [[ -z "$built" ]]; then
|
||||
echo "error: AppImage was not produced" >&2
|
||||
echo "error: AppImage was not produced (linuxdeploy failed?)" >&2
|
||||
exit 1
|
||||
fi
|
||||
if [[ "$(basename "$built")" != "${IMAGE_NAME}" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user