From 1af1d536b562aa55205c51ea397ebb62b927f011 Mon Sep 17 00:00:00 2001
From: SoScared <SoScared123@Gmail.com>
Date: Sun, 6 May 2018 18:43:27 +0200
Subject: [PATCH] ModSDK update including Linux install support

---
 .travis.yml                                  |   1 +
 Makefile                                     |  26 ++--
 fetch-engine.sh                              |  17 +++
 launch-dedicated.cmd                         |  17 ++-
 launch-dedicated.sh                          |  20 ++-
 launch-game.cmd                              |  22 ++-
 launch-game.sh                               |  20 ++-
 make.ps1                                     |  29 +++-
 mod.config                                   |  27 ++--
 packaging/linux/buildpackage.sh              | 140 +++++++++++++++++++
 packaging/linux/include/AppRun.in            |  38 +++++
 packaging/linux/include/Eluant.dll.config    |   3 +
 packaging/linux/include/OpenAL-CS.dll.config |   4 +
 packaging/linux/include/SDL2-CS.dll.config   |   4 +
 packaging/linux/include/mod-mimeinfo.xml.in  |   8 ++
 packaging/linux/include/mod-server.in        |   6 +
 packaging/linux/include/mod.desktop.in       |  11 ++
 packaging/linux/include/mod.in               |  52 +++++++
 packaging/linux/mod_128x128.png              | Bin 0 -> 1852 bytes
 packaging/linux/mod_16x16.png                | Bin 0 -> 265 bytes
 packaging/linux/mod_256x256.png              | Bin 0 -> 4487 bytes
 packaging/linux/mod_32x32.png                | Bin 0 -> 542 bytes
 packaging/linux/mod_48x48.png                | Bin 0 -> 1672 bytes
 packaging/linux/mod_64x64.png                | Bin 0 -> 952 bytes
 packaging/osx/buildpackage.sh                |  30 +++-
 packaging/windows/buildpackage.sh            |  30 +++-
 utility.cmd                                  |  21 ++-
 utility.sh                                   |  20 ++-
 28 files changed, 477 insertions(+), 69 deletions(-)
 create mode 100644 packaging/linux/buildpackage.sh
 create mode 100644 packaging/linux/include/AppRun.in
 create mode 100644 packaging/linux/include/Eluant.dll.config
 create mode 100644 packaging/linux/include/OpenAL-CS.dll.config
 create mode 100644 packaging/linux/include/SDL2-CS.dll.config
 create mode 100644 packaging/linux/include/mod-mimeinfo.xml.in
 create mode 100644 packaging/linux/include/mod-server.in
 create mode 100644 packaging/linux/include/mod.desktop.in
 create mode 100644 packaging/linux/include/mod.in
 create mode 100644 packaging/linux/mod_128x128.png
 create mode 100644 packaging/linux/mod_16x16.png
 create mode 100644 packaging/linux/mod_256x256.png
 create mode 100644 packaging/linux/mod_32x32.png
 create mode 100644 packaging/linux/mod_48x48.png
 create mode 100644 packaging/linux/mod_64x64.png

diff --git a/.travis.yml b/.travis.yml
index 1b9efa0..61ea43c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ deploy:
     - build/${PACKAGING_INSTALLER_NAME}-${TRAVIS_TAG}.exe
     - build/${PACKAGING_INSTALLER_NAME}-${TRAVIS_TAG}-macOS.zip
     - build/${PACKAGING_INSTALLER_NAME}-${TRAVIS_TAG}-winportable.zip
+    - build/${PACKAGING_INSTALLER_NAME}-${TRAVIS_TAG}.AppImage
   skip_cleanup: true
   on:
     tags: true
diff --git a/Makefile b/Makefile
index e637d82..4ecdb4b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,12 +25,7 @@
 VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 MOD_ID = $(shell cat user.config mod.config 2> /dev/null | awk -F= '/MOD_ID/ { print $$2; exit }')
 ENGINE_DIRECTORY = $(shell cat user.config mod.config 2> /dev/null | awk -F= '/ENGINE_DIRECTORY/ { print $$2; exit }')
-INCLUDE_DEFAULT_MODS = $(shell cat user.config mod.config 2> /dev/null | awk -F= '/INCLUDE_DEFAULT_MODS/ { print $$2; exit }')
-
-MOD_SEARCH_PATHS = "$(shell python -c "import os; print(os.path.realpath('.'))")/mods"
-ifeq ($(INCLUDE_DEFAULT_MODS),"True")
-	MOD_SEARCH_PATHS := "$(MOD_SEARCH_PATHS),./mods"
-endif
+MOD_SEARCH_PATHS = "$(shell python -c "import os; print(os.path.realpath('.'))")/mods,./mods"
 
 MANIFEST_PATH = "mods/$(MOD_ID)/mod.yaml"
 
@@ -39,7 +34,20 @@ HAS_LUAC = $(shell command -v luac 2> /dev/null)
 LUA_FILES = $(shell find mods/*/maps/* -iname '*.lua')
 PROJECT_DIRS = $(shell dirname $$(find . -iname "*.csproj" -not -path "$(ENGINE_DIRECTORY)/*"))
 
-engine:
+variables:
+	@if [ -z "$(MOD_ID)" ] || [ -z "$(ENGINE_DIRECTORY)" ];then \
+			echo "Required mod.config variables are missing:"; \
+			if [ -z "$(MOD_ID)" ]; then \
+				echo "   MOD_ID"; \
+			fi; \
+			if [ -z "$(ENGINE_DIRECTORY)" ]; then \
+				echo "   ENGINE_DIRECTORY"; \
+			fi; \
+			echo "Repair your mod.config (or user.config) and try again."; \
+			exit 1; \
+		fi
+
+engine: variables
 	@./fetch-engine.sh || (printf "Unable to continue without engine files\n"; exit 1)
 	@cd $(ENGINE_DIRECTORY) && make core
 
@@ -65,13 +73,13 @@ endif
 	@cd $(ENGINE_DIRECTORY) && make clean
 	@printf "The engine has been cleaned.\n"
 
-version:
+version: variables
 	@awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $(MANIFEST_PATH) > $(MANIFEST_PATH).tmp && \
 	awk '{sub("/[^/]*: User$$", "/$(VERSION): User"); print $0}' $(MANIFEST_PATH).tmp > $(MANIFEST_PATH) && \
 	rm $(MANIFEST_PATH).tmp
 	@printf "Version changed to $(VERSION).\n"
 
-check-scripts:
+check-scripts: variables
 ifeq ("$(HAS_LUAC)","")
 	@printf "'luac' not found.\n" && exit 1
 endif
diff --git a/fetch-engine.sh b/fetch-engine.sh
index 0e53acd..1cbd3ee 100755
--- a/fetch-engine.sh
+++ b/fetch-engine.sh
@@ -5,6 +5,19 @@
 command -v curl >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires curl."; exit 1; }
 command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; }
 
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
+
 TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
 
@@ -16,6 +29,8 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
 	. "${TEMPLATE_ROOT}/user.config"
 fi
 
+require_variables "MOD_ID" "ENGINE_VERSION" "ENGINE_DIRECTORY"
+
 CURRENT_ENGINE_VERSION=$(cat "${ENGINE_DIRECTORY}/VERSION" 2> /dev/null)
 
 if [ -f "${ENGINE_DIRECTORY}/VERSION" ] && [ "${CURRENT_ENGINE_VERSION}" = "${ENGINE_VERSION}" ]; then
@@ -23,6 +38,8 @@ if [ -f "${ENGINE_DIRECTORY}/VERSION" ] && [ "${CURRENT_ENGINE_VERSION}" = "${EN
 fi
 
 if [ "${AUTOMATIC_ENGINE_MANAGEMENT}" = "True" ]; then
+	require_variables "AUTOMATIC_ENGINE_SOURCE" "AUTOMATIC_ENGINE_EXTRACT_DIRECTORY" "AUTOMATIC_ENGINE_TEMP_ARCHIVE_NAME"
+	
 	echo "OpenRA engine version ${ENGINE_VERSION} is required."
 
 	if [ -d "${ENGINE_DIRECTORY}" ]; then
diff --git a/launch-dedicated.cmd b/launch-dedicated.cmd
index f5f07cc..19cd5cc 100644
--- a/launch-dedicated.cmd
+++ b/launch-dedicated.cmd
@@ -10,17 +10,19 @@ set EnableSingleplayer=False
 set Password=""
 
 @echo off
+setlocal EnableDelayedExpansion
 
 title %Name%
 FOR /F "tokens=1,2 delims==" %%A IN (mod.config) DO (set %%A=%%B)
 if exist user.config (FOR /F "tokens=1,2 delims==" %%A IN (user.config) DO (set %%A=%%B))
+set MOD_SEARCH_PATHS=%~dp0mods,./mods
 
-set MOD_SEARCH_PATHS=%~dp0mods
-if %INCLUDE_DEFAULT_MODS% neq "True" goto start
-set MOD_SEARCH_PATHS=%MOD_SEARCH_PATHS%,./mods
+if "!MOD_ID!" == "" goto badconfig
+if "!ENGINE_VERSION!" == "" goto badconfig
+if "!ENGINE_DIRECTORY!" == "" goto badconfig
 
-:start
 if not exist %ENGINE_DIRECTORY%\OpenRA.Game.exe goto noengine
+>nul find %ENGINE_VERSION% %ENGINE_DIRECTORY%\VERSION || goto noengine
 cd %ENGINE_DIRECTORY%
 
 :loop
@@ -31,4 +33,11 @@ goto loop
 echo Required engine files not found.
 echo Run `make all` in the mod directory to fetch and build the required files, then try again.
 pause
+exit /b
+
+:badconfig
+echo Required mod.config variables are missing.
+echo Ensure that MOD_ID ENGINE_VERSION and ENGINE_DIRECTORY are
+echo defined in your mod.config (or user.config) and try again.
+pause
 exit /b
\ No newline at end of file
diff --git a/launch-dedicated.sh b/launch-dedicated.sh
index 407befc..3feac05 100755
--- a/launch-dedicated.sh
+++ b/launch-dedicated.sh
@@ -8,8 +8,21 @@ set -e
 command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; }
 command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires mono."; exit 1; }
 
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
 TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
+MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods,./mods"
 
 # shellcheck source=mod.config
 . "${TEMPLATE_ROOT}/mod.config"
@@ -19,10 +32,7 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
 	. "${TEMPLATE_ROOT}/user.config"
 fi
 
-MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
-if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
-	MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS},./mods"
-fi
+require_variables "MOD_ID" "ENGINE_VERSION" "ENGINE_DIRECTORY"
 
 NAME="${Name:-"Dedicated Server"}"
 LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
@@ -33,7 +43,7 @@ ENABLE_SINGLE_PLAYER="${EnableSingleplayer:-"False"}"
 PASSWORD="${Password:-""}"
 
 cd "${TEMPLATE_ROOT}"
-if [ ! -f "${ENGINE_DIRECTORY}/OpenRA.Game.exe" ]; then
+if [ ! -f "${ENGINE_DIRECTORY}/OpenRA.Game.exe" ] || [ "$(cat "${ENGINE_DIRECTORY}/VERSION")" != "${ENGINE_VERSION}" ]; then
 	echo "Required engine files not found."
 	echo "Run \`make\` in the mod directory to fetch and build the required files, then try again.";
 	exit 1
diff --git a/launch-game.cmd b/launch-game.cmd
index 56a982a..2c98fda 100644
--- a/launch-game.cmd
+++ b/launch-game.cmd
@@ -1,18 +1,21 @@
 @echo off
+setlocal EnableDelayedExpansion
 title OpenRA
+
 FOR /F "tokens=1,2 delims==" %%A IN (mod.config) DO (set %%A=%%B)
 if exist user.config (FOR /F "tokens=1,2 delims==" %%A IN (user.config) DO (set %%A=%%B))
-
 set TEMPLATE_LAUNCHER=%0
-set MOD_SEARCH_PATHS=%~dp0mods
-if %INCLUDE_DEFAULT_MODS% neq "True" goto launch
-set MOD_SEARCH_PATHS=%MOD_SEARCH_PATHS%,./mods
+set MOD_SEARCH_PATHS=%~dp0mods,./mods
+
+if "!MOD_ID!" == "" goto badconfig
+if "!ENGINE_VERSION!" == "" goto badconfig
+if "!ENGINE_DIRECTORY!" == "" goto badconfig
 
-:launch
 set TEMPLATE_DIR=%CD%
 if not exist %ENGINE_DIRECTORY%\OpenRA.Game.exe goto noengine
-
+>nul find %ENGINE_VERSION% %ENGINE_DIRECTORY%\VERSION || goto noengine
 cd %ENGINE_DIRECTORY%
+
 OpenRA.Game.exe Game.Mod=%MOD_ID% Engine.LaunchPath="%TEMPLATE_LAUNCHER%" "Engine.ModSearchPaths=%MOD_SEARCH_PATHS%"  "%*"
 set ERROR=%errorlevel%
 cd %TEMPLATE_DIR%
@@ -26,6 +29,13 @@ echo Run `make all` in the mod directory to fetch and build the required files,
 pause
 exit /b
 
+:badconfig
+echo Required mod.config variables are missing.
+echo Ensure that MOD_ID ENGINE_VERSION and ENGINE_DIRECTORY are
+echo defined in your mod.config (or user.config) and try again.
+pause
+exit /b
+
 :crashdialog
 echo ----------------------------------------
 echo OpenRA has encountered a fatal error.
diff --git a/launch-game.sh b/launch-game.sh
index 3094b39..86381e1 100755
--- a/launch-game.sh
+++ b/launch-game.sh
@@ -4,8 +4,21 @@ set -e
 command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; }
 command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires mono."; exit 1; }
 
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
 TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
+MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods,./mods"
 
 # shellcheck source=mod.config
 . "${TEMPLATE_ROOT}/mod.config"
@@ -15,13 +28,10 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
 	. "${TEMPLATE_ROOT}/user.config"
 fi
 
-MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
-if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
-	MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS},./mods"
-fi
+require_variables "MOD_ID" "ENGINE_VERSION" "ENGINE_DIRECTORY"
 
 cd "${TEMPLATE_ROOT}"
-if [ ! -f "${ENGINE_DIRECTORY}/OpenRA.Game.exe" ]; then
+if [ ! -f "${ENGINE_DIRECTORY}/OpenRA.Game.exe" ] || [ "$(cat "${ENGINE_DIRECTORY}/VERSION")" != "${ENGINE_VERSION}" ]; then
 	echo "Required engine files not found."
 	echo "Run \`make\` in the mod directory to fetch and build the required files, then try again.";
 	exit 1
diff --git a/make.ps1 b/make.ps1
index 58ed470..e279c62 100644
--- a/make.ps1
+++ b/make.ps1
@@ -217,7 +217,7 @@ function ReadConfigLine($line, $name)
 
 function ParseConfigFile($fileName)
 {
-	$names = @("MOD_ID", "INCLUDE_DEFAULT_MODS", "ENGINE_VERSION", "AUTOMATIC_ENGINE_MANAGEMENT", "AUTOMATIC_ENGINE_SOURCE",
+	$names = @("MOD_ID", "ENGINE_VERSION", "AUTOMATIC_ENGINE_MANAGEMENT", "AUTOMATIC_ENGINE_SOURCE",
 		"AUTOMATIC_ENGINE_EXTRACT_DIRECTORY", "AUTOMATIC_ENGINE_TEMP_ARCHIVE_NAME", "ENGINE_DIRECTORY")
 
 	$reader = [System.IO.File]::OpenText($fileName)
@@ -228,6 +228,27 @@ function ParseConfigFile($fileName)
 			ReadConfigLine $line $name
 		}
 	}
+
+	$missing = @()
+	foreach ($name in $names)
+	{
+		if (!([System.Environment]::GetEnvironmentVariable($name)))
+		{
+			$missing += $name
+		}
+	}
+
+	if ($missing)
+	{
+		echo "Required mod.config variables are missing:"
+		foreach ($m in $missing)
+		{
+			echo "   $m"
+		}
+		echo "Repair your mod.config (or user.config) and try again."
+		WaitForInput
+		exit
+	}
 }
 
 ###############################################################
@@ -272,11 +293,7 @@ if (Test-Path "user.config")
 
 $modID = $env:MOD_ID
 
-$env:MOD_SEARCH_PATHS = (Get-Item -Path ".\" -Verbose).FullName + "\mods"
-if ($env:INCLUDE_DEFAULT_MODS -eq "True")
-{
-	$env:MOD_SEARCH_PATHS = $env:MOD_SEARCH_PATHS + ",./mods"
-}
+$env:MOD_SEARCH_PATHS = (Get-Item -Path ".\" -Verbose).FullName + "\mods,./mods"
 
 # Run the same command on the engine's make file
 if ($command -eq "all" -or $command -eq "clean")
diff --git a/mod.config b/mod.config
index 6e77a3e..91fc512 100644
--- a/mod.config
+++ b/mod.config
@@ -9,13 +9,7 @@
 MOD_ID="ura"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="39aa1a9"
-
-# Enable this to make the default OpenRA mods available for use in your mod.yaml
-# Packages list (via $mod references). Accepts values "True" or "False".
-# WARNING: This setting is provided to simplify early project development,
-# and must be disabled before you can package installers for your project!
-INCLUDE_DEFAULT_MODS="False"
+ENGINE_VERSION="3febae1"
 
 ##############################################################################
 # Continuous Integration
@@ -30,7 +24,7 @@ TRAVIS_TEST_MOD="True"
 
 # Perform a dry run of the installer generation when a new commit is pushed to the GitHub repository
 # Accepts values "True" or "False".
-TRAVIS_TEST_PACKAGING="False"
+TRAVIS_TEST_PACKAGING="True"
 
 ##############################################################################
 # Packaging
@@ -41,6 +35,7 @@ TRAVIS_TEST_PACKAGING="False"
 # The prefix used for the installer filenames.
 #  - Windows installers will be named as {PACKAGING_INSTALLER_NAME}-{TAG}.exe
 #  - macOS installers will be named as {PACKAGING_INSTALLER_NAME}-{TAG}.zip
+#  - Linux .appimages will be named as {PACKAGING_INSTALLER_NAME}-${TAG}.AppImage
 PACKAGING_INSTALLER_NAME="RedAlertUnplugged"
 
 # The human-readable name for this project.
@@ -53,6 +48,7 @@ PACKAGING_INSTALLER_NAME="RedAlertUnplugged"
 #  - Windows start menu
 #  - Windows desktop shortcut
 #  - Windows "Programs and Features" list
+#  - Linux launcher shortcut
 PACKAGING_DISPLAY_NAME="Red Alert Unplugged"
 
 # The URL for the project homepage.
@@ -60,7 +56,7 @@ PACKAGING_DISPLAY_NAME="Red Alert Unplugged"
 #  - Windows "Add/Remove Programs" list
 PACKAGING_WEBSITE_URL="https://github.com/RAunplugged/uRA/wiki"
 
-# The URL that is opened when a player presses the "FAQ" button in the crash dialog.
+# The URL that is displayed in the crash dialog.
 PACKAGING_FAQ_URL="http://wiki.openra.net/FAQ"
 
 # The human-readable project authors.
@@ -81,6 +77,13 @@ PACKAGING_WINDOWS_INSTALL_DIR_NAME="Red Alert Unplugged"
 # This should not contain spaces or special characters.
 PACKAGING_WINDOWS_REGISTRY_KEY="RedAlertUnplugged"
 
+# The git tag to use for the AppImage dependencies.
+PACKAGING_APPIMAGE_DEPENDENCIES_TAG="20180408"
+
+# Space delimited list of additional files/directories to copy from the engine directory
+# when packaging your mod. e.g. "./mods/modcontent" or "./mods/d2k/OpenRA.Mods.D2k.dll"
+PACKAGING_COPY_ENGINE_FILES="./mods/modcontent"
+
 ##############################################################################
 # Advanced Configuration
 #
@@ -105,3 +108,9 @@ PACKAGING_OSX_LAUNCHER_SOURCE="https://github.com/OpenRA/OpenRALauncherOSX/relea
 
 # Temporary file name used when downloading the OpenRA macOS launcher files.
 PACKAGING_OSX_LAUNCHER_TEMP_ARCHIVE_NAME="launcher.zip"
+
+# The url to download the OpenRA AppImage dependencies.
+PACKAGING_APPIMAGE_DEPENDENCIES_SOURCE="https://github.com/OpenRA/AppImageSupport/releases/download/${PACKAGING_APPIMAGE_DEPENDENCIES_TAG}/libs.tar.bz2"
+
+# Temporary file name used when downloading the OpenRA AppImage dependencies.
+PACKAGING_APPIMAGE_DEPENDENCIES_TEMP_ARCHIVE_NAME="libs.tar.bz2"
\ No newline at end of file
diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
new file mode 100644
index 0000000..57b4674
--- /dev/null
+++ b/packaging/linux/buildpackage.sh
@@ -0,0 +1,140 @@
+#!/bin/bash
+# OpenRA packaging script for Linux (AppImage)
+set -e
+
+command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires make."; exit 1; }
+command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; }
+command -v tar >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires tar."; exit 1; }
+command -v curl >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires curl."; exit 1; }
+
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
+if [ $# -eq "0" ]; then
+	echo "Usage: `basename $0` version [outputdir]"
+	exit 1
+fi
+
+PACKAGING_DIR=$(python -c "import os; print(os.path.dirname(os.path.realpath('$0')))")
+TEMPLATE_ROOT="${PACKAGING_DIR}/../../"
+
+# shellcheck source=mod.config
+. "${TEMPLATE_ROOT}/mod.config"
+
+if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
+	# shellcheck source=user.config
+	. "${TEMPLATE_ROOT}/user.config"
+fi
+
+require_variables "MOD_ID" "ENGINE_DIRECTORY" "PACKAGING_DISPLAY_NAME" "PACKAGING_INSTALLER_NAME" \
+	"PACKAGING_APPIMAGE_DEPENDENCIES_TAG" "PACKAGING_APPIMAGE_DEPENDENCIES_SOURCE" "PACKAGING_APPIMAGE_DEPENDENCIES_TEMP_ARCHIVE_NAME" \
+	"PACKAGING_FAQ_URL"
+
+TAG="$1"
+if [ $# -eq "1" ]; then
+	OUTPUTDIR=$(python -c "import os; print(os.path.realpath('.'))")
+else
+	OUTPUTDIR=$(python -c "import os; print(os.path.realpath('$2'))")
+fi
+
+BUILTDIR="${PACKAGING_DIR}/${PACKAGING_INSTALLER_NAME}.appdir"
+
+# Set the working dir to the location of this script
+cd "${PACKAGING_DIR}"
+
+pushd "${TEMPLATE_ROOT}" > /dev/null
+
+if [ ! -f "${ENGINE_DIRECTORY}/Makefile" ]; then
+	echo "Required engine files not found."
+	echo "Run \`make\` in the mod directory to fetch and build the required files, then try again.";
+	exit 1
+fi
+
+if [ ! -d "${OUTPUTDIR}" ]; then
+	echo "Output directory '${OUTPUTDIR}' does not exist.";
+	exit 1
+fi
+
+echo "Building core files"
+
+make version VERSION="${TAG}"
+
+pushd "${ENGINE_DIRECTORY}" > /dev/null
+make linux-dependencies
+make core SDK="-sdk:4.5"
+make install-engine prefix="usr" DESTDIR="${BUILTDIR}/"
+make install-common-mod-files prefix="usr" DESTDIR="${BUILTDIR}/"
+
+for f in ${PACKAGING_COPY_ENGINE_FILES}; do
+  mkdir -p "${BUILTDIR}/usr/lib/openra/$(dirname "${f}")"
+  cp -r "${f}" "${BUILTDIR}/usr/lib/openra/${f}"
+done
+
+popd > /dev/null
+popd > /dev/null
+
+# Add native libraries
+echo "Downloading dependencies"
+curl -s -L -o "${PACKAGING_APPIMAGE_DEPENDENCIES_TEMP_ARCHIVE_NAME}" -O "${PACKAGING_APPIMAGE_DEPENDENCIES_SOURCE}" || exit 3
+tar xf "${PACKAGING_APPIMAGE_DEPENDENCIES_TEMP_ARCHIVE_NAME}"
+
+curl -s -L -O https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+chmod a+x appimagetool-x86_64.AppImage
+
+echo "Building AppImage"
+
+# Add mod files
+cp -Lr "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/usr/lib/openra/mods"
+
+install -Dm 0755 libSDL2.so "${BUILTDIR}/usr/lib/openra/"
+install -Dm 0644 include/SDL2-CS.dll.config "${BUILTDIR}/usr/lib/openra/"
+install -Dm 0755 libopenal.so "${BUILTDIR}/usr/lib/openra/"
+install -Dm 0644 include/OpenAL-CS.dll.config "${BUILTDIR}/usr/lib/openra/"
+install -Dm 0755 liblua.so "${BUILTDIR}/usr/lib/openra/"
+install -Dm 0644 include/Eluant.dll.config "${BUILTDIR}/usr/lib/openra/"
+
+# Add launcher and icons
+sed "s/{MODID}/${MOD_ID}/g" include/AppRun.in | sed "s/{MODNAME}/${PACKAGING_DISPLAY_NAME}/g" > AppRun.temp
+install -m 0755 AppRun.temp "${BUILTDIR}/AppRun"
+
+sed "s/{MODID}/${MOD_ID}/g" include/mod.desktop.in | sed "s/{MODNAME}/${PACKAGING_DISPLAY_NAME}/g" | sed "s/{TAG}/${TAG}/g" > temp.desktop
+install -Dm 0755 temp.desktop "${BUILTDIR}/usr/share/applications/openra-${MOD_ID}.desktop"
+install -m 0755 temp.desktop "${BUILTDIR}/openra-${MOD_ID}.desktop"
+
+sed "s/{MODID}/${MOD_ID}/g" include/mod-mimeinfo.xml.in | sed "s/{TAG}/${TAG}/g" > temp.xml
+install -Dm 0755 temp.xml "${BUILTDIR}/usr/share/mime/packages/openra-${MOD_ID}.xml"
+
+if [ -f "${PACKAGING_DIR}/mod_scalable.svg" ]; then
+  install -Dm644 "${PACKAGING_DIR}/mod_scalable.svg" "${BUILTDIR}/usr/share/icons/hicolor/scalable/apps/openra-${MOD_ID}.svg"
+fi
+
+for i in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do
+  if [ -f "${PACKAGING_DIR}/mod_${i}.png" ]; then
+    install -Dm644 "${PACKAGING_DIR}/mod_${i}.png" "${BUILTDIR}/usr/share/icons/hicolor/${i}/apps/openra-${MOD_ID}.png"
+    install -m644 "${PACKAGING_DIR}/mod_${i}.png" "${BUILTDIR}/openra-${MOD_ID}.png"
+  fi
+done
+
+install -d "${BUILTDIR}/usr/bin"
+
+sed "s/{MODID}/${MOD_ID}/g" include/mod.in | sed "s/{TAG}/${TAG}/g" | sed "s/{MODNAME}/${PACKAGING_DISPLAY_NAME}/g" | sed "s/{MODINSTALLERNAME}/${PACKAGING_INSTALLER_NAME}/g" | sed "s|{MODFAQURL}|${PACKAGING_FAQ_URL}|g" > openra-mod.temp
+install -m 0755 openra-mod.temp "${BUILTDIR}/usr/bin/openra-${MOD_ID}"
+
+sed "s/{MODID}/${MOD_ID}/g" include/mod-server.in  > openra-mod-server.temp
+install -m 0755 openra-mod-server.temp "${BUILTDIR}/usr/bin/openra-${MOD_ID}-server"
+
+# travis-ci doesn't support mounting FUSE filesystems so extract and run the contents manually
+./appimagetool-x86_64.AppImage --appimage-extract
+ARCH=x86_64 ./squashfs-root/AppRun "${BUILTDIR}" "${OUTPUTDIR}/${PACKAGING_INSTALLER_NAME}-${TAG}.AppImage"
+
+# Clean up
+rm -rf openra-mod.temp openra-mod-server.temp temp.desktop temp.xml AppRun.temp libSDL2.so libopenal.so liblua.so appimagetool-x86_64.AppImage squashfs-root "${PACKAGING_APPIMAGE_DEPENDENCIES_TEMP_ARCHIVE_NAME}" "${BUILTDIR}"
diff --git a/packaging/linux/include/AppRun.in b/packaging/linux/include/AppRun.in
new file mode 100644
index 0000000..353e9de
--- /dev/null
+++ b/packaging/linux/include/AppRun.in
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Make sure the user has a sufficiently recent version of mono on the PATH
+MINIMUM_MONO_VERSION="4.2"
+
+make_version() {
+  echo "$1" | tr '.' '\n' | head -n 4 | xargs printf "%03d%03d%03d%03d";
+}
+
+mono_missing_or_old() {
+  command -v mono >/dev/null 2>&1 || return 0
+  MONO_VERSION=$(mono --version | head -n1 | cut -d' ' -f5)
+  [ "$(make_version "${MONO_VERSION}")" -lt "$(make_version "${MINIMUM_MONO_VERSION}")" ] && return 0
+  return 1
+}
+
+if mono_missing_or_old; then
+  ERROR_MESSAGE="{MODNAME} requires Mono ${MINIMUM_MONO_VERSION} or greater.\nPlease install Mono using your system package manager."
+  if command -v zenity > /dev/null; then
+    zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
+  elif command -v kdialog > /dev/null; then
+    kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}"
+  else
+    printf "${ERROR_MESSAGE}"
+  fi
+  exit 1
+fi
+
+# Run the game or server
+HERE="$(dirname "$(readlink -f "${0}")")"
+export PATH="${HERE}"/usr/bin/:"${PATH}"
+export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}"
+
+if [ -n "$1" ] && [ "$1" = "--server" ]; then
+  exec "openra-{MODID}-server" "$@"
+else
+  exec "openra-{MODID}" "$@"
+fi
diff --git a/packaging/linux/include/Eluant.dll.config b/packaging/linux/include/Eluant.dll.config
new file mode 100644
index 0000000..561d8e9
--- /dev/null
+++ b/packaging/linux/include/Eluant.dll.config
@@ -0,0 +1,3 @@
+<configuration>
+  <dllmap os="linux" dll="lua51.dll" target="./liblua.so" />
+</configuration>
diff --git a/packaging/linux/include/OpenAL-CS.dll.config b/packaging/linux/include/OpenAL-CS.dll.config
new file mode 100644
index 0000000..43cedc7
--- /dev/null
+++ b/packaging/linux/include/OpenAL-CS.dll.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<dllmap dll="soft_oal.dll" os="linux" target="./libopenal.so"/>
+</configuration>
diff --git a/packaging/linux/include/SDL2-CS.dll.config b/packaging/linux/include/SDL2-CS.dll.config
new file mode 100644
index 0000000..a2aa928
--- /dev/null
+++ b/packaging/linux/include/SDL2-CS.dll.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<dllmap os="linux" dll="SDL2.dll" target="./libSDL2.so" />
+</configuration>
diff --git a/packaging/linux/include/mod-mimeinfo.xml.in b/packaging/linux/include/mod-mimeinfo.xml.in
new file mode 100644
index 0000000..a1e8c19
--- /dev/null
+++ b/packaging/linux/include/mod-mimeinfo.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="x-scheme-handler/openra-{MODID}-{TAG}">
+    <generic-icon name="applications-games"/>
+    <comment>Join OpenRA server</comment>
+    <glob weight="60" pattern="openra-{MODID}-{TAG}://*"/>
+  </mime-type>
+</mime-info>
diff --git a/packaging/linux/include/mod-server.in b/packaging/linux/include/mod-server.in
new file mode 100644
index 0000000..a2798c2
--- /dev/null
+++ b/packaging/linux/include/mod-server.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+HERE="$(dirname "$(readlink -f "${0}")")"
+cd "${HERE}/../lib/openra" || exit 1
+
+mono --debug OpenRA.Server.exe Game.Mod={MODID} "$@"
diff --git a/packaging/linux/include/mod.desktop.in b/packaging/linux/include/mod.desktop.in
new file mode 100644
index 0000000..bb4c2a4
--- /dev/null
+++ b/packaging/linux/include/mod.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=OpenRA - {MODNAME}
+GenericName=Real Time Strategy Game
+Icon=openra-{MODID}
+Exec=openra-{MODID} %u
+Terminal=false
+Categories=Game;StrategyGame;
+StartupWMClass=openra-{MODID}-{TAG}
+MimeType=x-scheme-handler/openra-{MODID}-{TAG};
diff --git a/packaging/linux/include/mod.in b/packaging/linux/include/mod.in
new file mode 100644
index 0000000..45bf353
--- /dev/null
+++ b/packaging/linux/include/mod.in
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+LAUNCHER=$(readlink -f "${0}")
+HERE="$(dirname "${LAUNCHER}")"
+cd "${HERE}/../lib/openra" || exit 1
+
+# APPIMAGE is an environment variable set by the runtime
+# defining the absolute path to the .AppImage file
+if [ ! -z "${APPIMAGE}" ]; then
+  LAUNCHER=${APPIMAGE}
+
+  # appimaged doesn't update the mime or icon caches when registering AppImages.
+  # Run update-desktop-database and gtk-update-icon-cache ourselves if we detect
+  # that the desktop file has been installed but the handler is not cached
+  if command -v update-desktop-database > /dev/null; then
+    APPIMAGEID=$(printf "file://%s" "${APPIMAGE}" | md5sum | cut -d' ' -f1)
+    LAUNCHER_NAME="appimagekit_${APPIMAGEID}-openra-{MODID}.desktop"
+    LAUNCHER_PATH="${HOME}/.local/share/applications/${LAUNCHER_NAME}"
+    MIMECACHE_PATH="${HOME}/.local/share/applications/mimeinfo.cache"
+    SCHEME="x-scheme-handler/openra-{MODID}-{TAG}"
+    if [ -f "${LAUNCHER_PATH}" ] && ! grep -qs "${SCHEME}=" "${MIMECACHE_PATH}"; then
+        update-desktop-database "${HOME}/.local/share/applications"
+        if command -v gtk-update-icon-cache > /dev/null; then
+          gtk-update-icon-cache ~/.local/share/icons/hicolor/ -t
+        fi
+    fi
+  fi
+fi
+
+# Search for server connection
+PROTOCOL_PREFIX="openra-{MODID}-{TAG}://"
+JOIN_SERVER=""
+if [ "${1#${PROTOCOL_PREFIX}}" != "${1}" ]; then
+  JOIN_SERVER="Launch.Connect=${1#${PROTOCOL_PREFIX}}"
+fi
+
+# Run the game
+export SDL_VIDEO_X11_WMCLASS="openra-{MODID}-{TAG}"
+mono --debug OpenRA.Game.exe Game.Mod={MODID} Engine.LaunchPath="${LAUNCHER}" "${JOIN_SERVER}" "$@"
+
+# Show a crash dialog if something went wrong
+if [ $? != 0 ] && [ $? != 1 ]; then
+  ERROR_MESSAGE="{MODNAME} has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at {MODFAQURL}"
+  if command -v zenity > /dev/null; then
+    zenity --no-wrap --error --title "{MODNAME}" --text "${ERROR_MESSAGE}" 2> /dev/null
+  elif command -v kdialog > /dev/null; then
+    kdialog --title "{MODNAME}" --error "${ERROR_MESSAGE}"
+  else
+    printf "${ERROR_MESSAGE}\n"
+  fi
+  exit 1
+fi
diff --git a/packaging/linux/mod_128x128.png b/packaging/linux/mod_128x128.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed1b45814844596ec65165f9bf5d84430dad50eb
GIT binary patch
literal 1852
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

literal 0
HcmV?d00001

diff --git a/packaging/linux/mod_16x16.png b/packaging/linux/mod_16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..c31b0fc1ede7a516b92e25aff207321f28ed7d42
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|4tu&dhFAzD
zCrEs15Io6l<zQwlB!6TN_YwIEM*?=7V7t?(RoA~{k>CltrX$Bsvq&cNyRwQ0`0)A0
zFrIkM(rMVp!SujBpiWqT-SKKG^UK}<GcMMmgT4xO%`HzCYHex!BCJrx{%E<w8m=P}
z3@HvQ0@{j+VJe|B9lqHs^f?M0{&1*x!4q4RKhmBXg(vV9wK7hUXk$E4bmC2pg1byd
zY2yv<j=zl(%nf@!aCY2Rd?=zIouYgqO;Ul4(OJRmSu?A<5hKI*)k+^bml}8hy~E(?
L>gTe~DWM4fI9OZ6

literal 0
HcmV?d00001

diff --git a/packaging/linux/mod_256x256.png b/packaging/linux/mod_256x256.png
new file mode 100644
index 0000000000000000000000000000000000000000..e05a6f8b7142ecc0e249760d5cf5ee9fef7d0052
GIT binary patch
literal 4487
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

literal 0
HcmV?d00001

diff --git a/packaging/linux/mod_32x32.png b/packaging/linux/mod_32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..155dafd27917b353eee46282493406534787b4e9
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$*hxe|R9Fe^l}#&!K@`W4*9egmb~YAlC>Bal>||#p;RCQ^N7>of_yXQmlqf5<
zBqCN;bi2wzSs)AV{Qfe`z2?q+E;lyMsb6#EoHJ+6Ju~y%jEqpi4ul=}=MH2#_HV;h
z>9EI}q8Rq#jp>+gkmNN03+dP_+mmDq-?qnp=<x-1`3l%1%Vgk8KMeF0kV?urf@|Og
z65Wedd<77JQ+Sswqx^DwVf_m1K$jy|FE$<N5<EHlF(z{f$78I?Cj*4&@?Jm{7^y|M
z1{K+3jAry5fvT=IfsSzs+ks`DMQ?|G&<jx~lwZHP7^Yzjl8Wg-vZvVX$W(~!7_@c*
zW<GS?i(L37t`Ct4=!7{~{I=rDaD;mKHT~2Y&~_mYbjPls5h4&sOb1fE19oyfU(>-s
z+Yzs)>lN5}E0_#fhCcL!`y_N&2~ts&Zyu^a&+-I1U=#w&Z;oJ$UDSGQTmnsS2ali+
zQ6Twg0nKE;hX-h}b{aufQD;zY*%PX!fO8`DJuF)p%Fv^rjfO3|RK2uSkWZuLUNHq|
zfe*cRi4y9(6}$d1XNZwfW)V<KOo6UyiU`VqWb#aa{(O`}8%S<J=j{^x5#@tf=ZXn!
gVF$tv{Cx-B096Hb_2Fr082|tP07*qoM6N<$f;g}2u>b%7

literal 0
HcmV?d00001

diff --git a/packaging/linux/mod_48x48.png b/packaging/linux/mod_48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5cc191c7c34a5532a0cb7f82e1f718a515c1a85
GIT binary patch
literal 1672
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

literal 0
HcmV?d00001

diff --git a/packaging/linux/mod_64x64.png b/packaging/linux/mod_64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..d780c5aeb914dd5d76ab8d1dda11600e2f190a43
GIT binary patch
literal 952
zcmV;p14sOcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&a!Eu%RCodHSWBo*Q53$OdBwn$N0b;SCQNlBHxijBB%%zMDq=vnC1M~Yuc(_L
zDT6y<phQBh2?LJ|J@PDyA9-B9ul{pe|LVN<w$J1CuT`smt+m(Qd#&%Rv(DasM~9Ii
zU<eojhJYbp2p9r}fFWQA7y^cXA<%XR49k)6did<f;pgJA56%x<CRFLW2b=#5%&V$Q
zNbWscD(xt@Jpdy;p87A$8SOEzmQ&ik0t|p!)@6x7`SgII!kdnTcdEtjLGM$xEOk2^
z<_ahFti#|R!saCEbHGoh*>29gaF=I}@6Z=HEU^Z@18R-k4)bGO%LHHyB6z40cn*DH
zY-Fv*Sx`TMC4g6<=Q-`RuB5aw0pQjPzzwiW<Prx`h_CV;u$=P}dS}X<+(Tspz`(YF
zWipg$OQK^Kkp91+cPBYZyH68jNiCO)ILfc#|1@LH1&l8PZxMc{AoqhG3mZkg_q&v>
z2l@?V^Hy~QNThw_b2%d!55Fg1xd)RUC+5$D{6YCJ@e#r&Rjl(tsDa2gfWL_h=0iT&
z)LFe3!SX$S2Yoa64>%ZARRK`~{4YXQ0p+dWBg)RCSAd<!rw4GO{Z6~IIzMVvGqv;Z
zU_aO>JkLVrCsWcPDA%PSl&mYD$b(Q)%o8y146G|5(r;lb_j@llsdEpIaejrue!!EV
zCN{xMV6XRnr~tsEc_Ms4LD6aG{InKEb$A7s+!=6G^78i!?DObQ6x9KMbx2Motz|Y=
z-4ui2Q8fT_kjZBS0MGqw#uA7V&<mj|0T_jh?t*2a>;sd*dzGEn;I-i3R3!k%k&R5A
ze{L*pX2?59pBn!JeKt5KRRzFmWWlE@0bneWra*ZGmOl5PvvPt_6#&Fta;_nxxX<<y
z*m?bxAn=$RjLHUp$Mf4@nb2G4(^4|(QU0tPUXwG)=Ptk_=jF_m(;fOT%s(;W=pc+;
zVt^++-UA3i67e3e6wEsViT$A$yb$~b{9mLiKt35?`AR}WOhA`2pKczS3MVEjW4a05
z>yChVgH#p(Are@Ls97-*gad<_cnW0zz~;uQtPK1;^cfy8A64rRknW^)_^xCTkC<b#
zoE*pbJ?9NCA_6ceQkuU!={1xsj~a5VJo}lCAz%m?0)~JgU<eojhJYbp2p9r}fFUr{
a5cmfXaf*9=oRkd!0000<MNUMnLSTZpU#MXK

literal 0
HcmV?d00001

diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index 08a9a09..7c8a623 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -6,6 +6,18 @@ command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires
 command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; }
 command -v curl >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires curl."; exit 1; }
 
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
 if [ $# -eq "0" ]; then
 	echo "Usage: `basename $0` version [outputdir]"
 	exit 1
@@ -22,11 +34,9 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
 	. "${TEMPLATE_ROOT}/user.config"
 fi
 
-if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
-	echo "Cannot generate installers while INCLUDE_DEFAULT_MODS is enabled."
-	echo "Make sure that this setting is disabled in both your mod.config and user.config."
-	exit 1
-fi
+require_variables "MOD_ID" "ENGINE_DIRECTORY" "PACKAGING_DISPLAY_NAME" "PACKAGING_INSTALLER_NAME" \
+	"PACKAGING_OSX_LAUNCHER_TAG" "PACKAGING_OSX_LAUNCHER_SOURCE" "PACKAGING_OSX_LAUNCHER_TEMP_ARCHIVE_NAME" \
+	"PACKAGING_FAQ_URL"
 
 TAG="$1"
 if [ $# -eq "1" ]; then
@@ -75,11 +85,17 @@ make osx-dependencies
 make core SDK="-sdk:4.5"
 make install-engine gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
 make install-common-mod-files gameinstalldir="/Contents/Resources/" DESTDIR="${BUILTDIR}/OpenRA.app"
+
+for f in ${PACKAGING_COPY_ENGINE_FILES}; do
+  mkdir -p "${BUILTDIR}/OpenRA.app/Contents/Resources/$(dirname "${f}")"
+  cp -r "${f}" "${BUILTDIR}/OpenRA.app/Contents/Resources/${f}"
+done
+
 popd > /dev/null
 popd > /dev/null
 
 # Add mod files
-cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/OpenRA.app/Contents/Resources/mods"
+cp -Lr "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/OpenRA.app/Contents/Resources/mods"
 cp "mod.icns" "${BUILTDIR}/OpenRA.app/Contents/Resources/${MOD_ID}.icns"
 
 pushd "${BUILTDIR}" > /dev/null
@@ -92,7 +108,7 @@ modify_plist "{JOIN_SERVER_URL_SCHEME}" "openra-${MOD_ID}-${TAG}" "${PACKAGING_O
 
 echo "Packaging zip archive"
 
-zip "${PACKAGING_INSTALLER_NAME}-${TAG}-macOS.zip" -r -9 "${PACKAGING_OSX_APP_NAME}" --quiet --symlinks
+zip "${PACKAGING_INSTALLER_NAME}-${TAG}-macOS.zip" -r -9 "${PACKAGING_OSX_APP_NAME}" --quiet
 mv "${PACKAGING_INSTALLER_NAME}-${TAG}-macOS.zip" "${OUTPUTDIR}"
 popd > /dev/null
 
diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh
index 52b8eae..9ff3489 100755
--- a/packaging/windows/buildpackage.sh
+++ b/packaging/windows/buildpackage.sh
@@ -4,6 +4,18 @@ set -e
 command -v curl >/dev/null 2>&1 || { echo >&2 "Windows packaging requires curl."; exit 1; }
 command -v makensis >/dev/null 2>&1 || { echo >&2 "Windows packaging requires makensis."; exit 1; }
 
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
 if [ $# -eq "0" ]; then
 	echo "Usage: `basename $0` version [outputdir]"
 	exit 1
@@ -20,11 +32,9 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
 	. "${TEMPLATE_ROOT}/user.config"
 fi
 
-if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
-	echo "Cannot generate installers while INCLUDE_DEFAULT_MODS is enabled."
-	echo "Make sure that this setting is disabled in both your mod.config and user.config."
-	exit 1
-fi
+require_variables "MOD_ID" "ENGINE_DIRECTORY" "PACKAGING_DISPLAY_NAME" "PACKAGING_INSTALLER_NAME" \
+	"PACKAGING_WINDOWS_LAUNCHER_NAME" "PACKAGING_WINDOWS_REGISTRY_KEY" "PACKAGING_WINDOWS_INSTALL_DIR_NAME" \
+	"PACKAGING_FAQ_URL" "PACKAGING_WEBSITE_URL" "PACKAGING_AUTHORS"
 
 TAG="$1"
 if [ $# -eq "1" ]; then
@@ -63,11 +73,17 @@ make windows-dependencies
 make core SDK="-sdk:4.5"
 make install-engine gameinstalldir="" DESTDIR="${BUILTDIR}"
 make install-common-mod-files gameinstalldir="" DESTDIR="${BUILTDIR}"
+
+for f in ${PACKAGING_COPY_ENGINE_FILES}; do
+  mkdir -p "${BUILTDIR}/$(dirname "${f}")"
+  cp -r "${f}" "${BUILTDIR}/${f}"
+done
+
 popd > /dev/null
 popd > /dev/null
 
 # Add mod files
-cp -r "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/mods"
+cp -Lr "${TEMPLATE_ROOT}/mods/"* "${BUILTDIR}/mods"
 cp "mod.ico" "${BUILTDIR}/${MOD_ID}.ico"
 cp "${SRC_DIR}/OpenRA.Game.exe.config" "${BUILTDIR}"
 
@@ -88,7 +104,7 @@ popd > /dev/null
 echo "Packaging zip archive"
 pushd "${BUILTDIR}" > /dev/null
 find "${SRC_DIR}/thirdparty/download/windows/" -name '*.dll' -exec cp '{}' '.' ';'
-zip "${PACKAGING_INSTALLER_NAME}-${TAG}-winportable" -r -9 * --quiet --symlinks
+zip "${PACKAGING_INSTALLER_NAME}-${TAG}-winportable" -r -9 * --quiet
 mv "${PACKAGING_INSTALLER_NAME}-${TAG}-winportable.zip" "${OUTPUTDIR}"
 popd > /dev/null
 
diff --git a/utility.cmd b/utility.cmd
index 500e2e2..2fd46b6 100644
--- a/utility.cmd
+++ b/utility.cmd
@@ -1,17 +1,19 @@
 @echo off
+setlocal EnableDelayedExpansion
 
 FOR /F "tokens=1,2 delims==" %%A IN (mod.config) DO (set %%A=%%B)
 if exist user.config (FOR /F "tokens=1,2 delims==" %%A IN (user.config) DO (set %%A=%%B))
+set MOD_SEARCH_PATHS=%~dp0mods,./mods
 
-title OpenRA.Utility.exe %MOD_ID%
+if "!MOD_ID!" == "" goto badconfig
+if "!ENGINE_VERSION!" == "" goto badconfig
+if "!ENGINE_DIRECTORY!" == "" goto badconfig
 
-set MOD_SEARCH_PATHS=%~dp0mods
-if %INCLUDE_DEFAULT_MODS% neq "True" goto start
-set MOD_SEARCH_PATHS=%MOD_SEARCH_PATHS%,./mods
+title OpenRA.Utility.exe %MOD_ID%
 
-:start
 set TEMPLATE_DIR=%CD%
 if not exist %ENGINE_DIRECTORY%\OpenRA.Game.exe goto noengine
+>nul find %ENGINE_VERSION% %ENGINE_DIRECTORY%\VERSION || goto noengine
 cd %ENGINE_DIRECTORY%
 
 :loop
@@ -35,4 +37,11 @@ goto loop
 echo Required engine files not found.
 echo Run `make all` in the mod directory to fetch and build the required files, then try again.
 pause
-exit /b
\ No newline at end of file
+exit /b
+
+:badconfig
+echo Required mod.config variables are missing.
+echo Ensure that MOD_ID ENGINE_VERSION and ENGINE_DIRECTORY are
+echo defined in your mod.config (or user.config) and try again.
+pause
+exit /b
diff --git a/utility.sh b/utility.sh
index ac35531..b649e7b 100755
--- a/utility.sh
+++ b/utility.sh
@@ -8,8 +8,21 @@ command -v make >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires
 command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires python."; exit 1; }
 command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod template requires mono."; exit 1; }
 
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
 TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
+MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods,./mods"
 
 # shellcheck source=mod.config
 . "${TEMPLATE_ROOT}/mod.config"
@@ -19,15 +32,12 @@ if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
 	. "${TEMPLATE_ROOT}/user.config"
 fi
 
-MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
-if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
-	MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS},./mods"
-fi
+require_variables "MOD_ID" "ENGINE_VERSION" "ENGINE_DIRECTORY"
 
 LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
 
 cd "${TEMPLATE_ROOT}"
-if [ ! -f "${ENGINE_DIRECTORY}/OpenRA.Game.exe" ]; then
+if [ ! -f "${ENGINE_DIRECTORY}/OpenRA.Game.exe" ] || [ "$(cat "${ENGINE_DIRECTORY}/VERSION")" != "${ENGINE_VERSION}" ]; then
 	echo "Required engine files not found."
 	echo "Run \`make\` in the mod directory to fetch and build the required files, then try again.";
 	exit 1