Merge remote-tracking branch 'origin/main'

# Conflicts:
#	scripts/package-native.sh
#	scripts/stage-build.sh

scripts/install-native-release.sh

@@ -116,8 +116,9 @@ manifest_value() {
 manifest_version="$(manifest_value manifest_version)"
 game_version="$(manifest_value game_version)"
 game_commit="$(manifest_value game_commit)"
+packaging_commit="$(manifest_value packaging_commit)"
 platform="$(manifest_value platform)"
-if [[ "${manifest_version}" != "1" ]]; then
+if [[ "${manifest_version}" != "1" && "${manifest_version}" != "2" ]]; then
 	echo "Unsupported BUILD_INFO format." >&2
 	exit 1
 fi
@@ -129,6 +130,11 @@ if [[ ! "${game_commit}" =~ ^[0-9a-f]{40}$ ]]; then
 	echo "Invalid game commit in BUILD_INFO." >&2
 	exit 1
 fi
+if [[ "${manifest_version}" == "2" \
+	&& ! "${packaging_commit}" =~ ^[0-9a-f]{40}$ ]]; then
+	echo "Invalid packaging commit in BUILD_INFO." >&2
+	exit 1
+fi
 if [[ "${platform}" != "linux-x86_64" ]]; then
 	echo "This installer only accepts linux-x86_64 packages." >&2
 	exit 1
@@ -227,6 +233,9 @@ if [[ -n "${old_current}" && "${old_current}" != "${release_dir}" ]]; then
 fi
 
 echo "Installed NETfishing dedicated server ${game_version} (${game_commit})."
+if [[ -n "${packaging_commit}" ]]; then
+	echo "Dedicated packaging commit: ${packaging_commit}."
+fi
 if ${service_exists} && ! ${service_active}; then
 	echo "${service_name} was inactive and was not started."
 fi

scripts/package-native.sh

@@ -18,6 +18,12 @@ package_name="netfishing-dedicated-server-${version}-linux-x86_64"
 staging_dir="$(mktemp -d)"
 trap 'rm -rf -- "${staging_dir}"' EXIT
 
+if ! git -C "${repository_dir}" diff --quiet \
+	|| ! git -C "${repository_dir}" diff --cached --quiet; then
+	echo "Commit dedicated packaging changes before creating a release." >&2
+	exit 1
+fi
+
 for filename in \
 	NETfishingServer.x86_64 \
 	NETfishingServer.pck \
@@ -44,6 +50,26 @@ if ! grep -Fxq "game_version=${version}" "${dist_dir}/BUILD_INFO"; then
 	echo "Staged BUILD_INFO does not match package version ${version}." >&2
 	exit 1
 fi
+packaging_commit="$(
+	awk -F= '$1 == "packaging_commit" {print tolower($2); exit}' \
+		"${dist_dir}/BUILD_INFO"
+)"
+current_packaging_commit="$(git -C "${repository_dir}" rev-parse HEAD)"
+if [[ "${packaging_commit}" != "${current_packaging_commit}" ]]; then
+	echo "Staged BUILD_INFO does not match the current packaging commit." >&2
+	exit 1
+fi
+release_tag="v${version}"
+if ! release_commit="$(
+	git -C "${repository_dir}" rev-parse --verify "refs/tags/${release_tag}^{commit}"
+)"; then
+	echo "Dedicated packaging tag ${release_tag} does not exist." >&2
+	exit 1
+fi
+if [[ "${release_commit}" != "${current_packaging_commit}" ]]; then
+	echo "Dedicated packaging tag ${release_tag} does not point to HEAD." >&2
+	exit 1
+fi
 (cd -- "${dist_dir}" && sha256sum -c SHA256SUMS)
 
 install -d "${staging_dir}/${package_name}"

scripts/stage-build.sh

@@ -12,6 +12,13 @@ game_commit="${3,,}"
 repository_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
 destination_dir="${repository_dir}/dist"
 licenses_dir="${destination_dir}/licenses"
+packaging_commit="$(git -C "${repository_dir}" rev-parse HEAD)"
+
+if ! git -C "${repository_dir}" diff --quiet \
+	|| ! git -C "${repository_dir}" diff --cached --quiet; then
+	echo "Commit dedicated packaging changes before staging a release." >&2
+	exit 1
+fi
 
 if [[ ! "${game_version}" =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ ]]; then
 	echo "GAME_VERSION must contain only letters, numbers, dots, underscores, or hyphens." >&2
@@ -21,6 +28,10 @@ if [[ ! "${game_commit}" =~ ^[0-9a-f]{40}$ ]]; then
 	echo "GAME_COMMIT must be the full 40-character Git commit." >&2
 	exit 2
 fi
+if [[ ! "${packaging_commit}" =~ ^[0-9a-f]{40}$ ]]; then
+	echo "Could not resolve the dedicated packaging Git commit." >&2
+	exit 2
+fi
 
 for filename in NETfishingServer.x86_64 NETfishingServer.pck; do
 	if [[ ! -f "${source_dir}/${filename}" ]]; then
@@ -53,9 +64,10 @@ pck_sha256="$(sha256sum NETfishingServer.pck | awk '{print $1}')"
 apply_umask="$(umask)"
 umask 022
 printf '%s\n' \
-	"manifest_version=1" \
+	"manifest_version=2" \
 	"game_version=${game_version}" \
 	"game_commit=${game_commit}" \
+	"packaging_commit=${packaging_commit}" \
 	"export_preset=Linux Dedicated Server" \
 	"platform=linux-x86_64" \
 	"executable_sha256=${executable_sha256}" \
@@ -71,6 +83,7 @@ Exact game source revision: ${game_commit}
 
 Packaging source:
 https://forge.makearmy.io/woofmeow/netfishing-dedicated-server
+Exact packaging source revision: ${packaging_commit}
 EOF
 umask "${apply_umask}"
 sha256sum \