this builds working packages

thumperward · Oct 9, 2023 · 8fe9e2b · 8fe9e2b
1 parent d11559a
commit 8fe9e2b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.devcontainer/Dockerfile.linux b/.devcontainer/Dockerfile.linux
@@ -6,6 +6,7 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/s
 
 # Install dependencies.
 RUN apt-get update && apt-get install -y --no-install-recommends \
+  file \
   nsis \
   imagemagick \
   wine64 \

diff --git a/.gitignore b/.gitignore
@@ -56,7 +56,11 @@ update.log
 .idea
 
 # Temporary packaging directories
-build/windows/
+build/
 packaging/windows_cross/build/
 packaging/linux/ra/
 packaging/linux/ra.appdir/
+packaging/linux/cnc/
+packaging/linux/cnc.appdir/
+packaging/linux/d2k/
+packaging/linux/d2k.appdir/
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
@@ -74,10 +74,10 @@ function build_linux_appimage() {
 	mkdir -p "${OUTPUTDIR}"
 	# Embed update metadata if (and only if) compiled on GitHub Actions
 	if [ -n "${GITHUB_REPOSITORY:-}" ]; then
-		ARCH=x86_64 appimagetool-x86_64.AppImage --no-appstream -u "zsync|https://master.openra.net/appimagecheck.zsync?mod=${MOD_ID}&channel=${UPDATE_CHANNEL}" "${APPDIR}" "${OUTPUTDIR}/${APPIMAGE}"
+		ARCH=x86_64 appimagetool-x86_64.AppImage --appimage-extract-and-run --no-appstream -u "zsync|https://master.openra.net/appimagecheck.zsync?mod=${MOD_ID}&channel=${UPDATE_CHANNEL}" "${APPDIR}" "${OUTPUTDIR}/${APPIMAGE}"
 		zsyncmake -u "https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG}/${APPIMAGE}" -o "${OUTPUTDIR}/${APPIMAGE}.zsync" "${OUTPUTDIR}/${APPIMAGE}"
 	else
-		ARCH=x86_64 appimagetool-x86_64.AppImage --no-appstream "${APPDIR}" "${OUTPUTDIR}/${APPIMAGE}"
+		ARCH=x86_64 appimagetool-x86_64.AppImage --appimage-extract-and-run --no-appstream "${APPDIR}" "${OUTPUTDIR}/${APPIMAGE}"
 	fi
 
 	rm -rf "${APPDIR}"