From 8f1beb7d7fba92cff04757387f084db7a3e782c1 Mon Sep 17 00:00:00 2001
From: Garux <garux@mail.ru>
Date: Mon, 27 May 2024 11:36:51 +0500
Subject: [PATCH] download all-in-one gamepacks archive during build by default

fixes #191
---
 .github/workflows/build.yml | 8 ++------
 Makefile                    | 4 ++--
 download-gamepacks.sh       | 7 +++++++
 install-gamepacks.sh        | 3 +++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fec1c544..60d0c330 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,9 +39,7 @@ jobs:
 
     - name: Build
       run: |
-        make DOWNLOAD_GAMEPACKS=no MAKEFILE_CONF=msys2-Makefile.conf BUILD=release -j4
-        wget https://www.dropbox.com/s/b1xpajzfa6yjlzf/netradiant-custom-extra-gamepacks.zip
-        unzip -o netradiant-custom-extra-gamepacks.zip -d "install"
+        make MAKEFILE_CONF=msys2-Makefile.conf -j4
         mkdir -p install/settings
         echo > install/settings/DUMMMY
 
@@ -70,9 +68,7 @@ jobs:
 
     - name: Build
       run: |
-        make DOWNLOAD_GAMEPACKS=no CXXFLAGS="-Wno-deprecated-copy" -j4
-        wget https://www.dropbox.com/s/b1xpajzfa6yjlzf/netradiant-custom-extra-gamepacks.zip
-        unzip -o netradiant-custom-extra-gamepacks.zip -d "install"
+        make CXXFLAGS="-Wno-deprecated-copy" -j4
         7z a Linux-${{ matrix.arch }}.7z ./install/*
 #       7z to preserve file permissions
 
diff --git a/Makefile b/Makefile
index eb2c335a..3b0f5702 100644
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,9 @@ LIBS_ZLIB          ?= -lz
 CPPFLAGS_JPEG      ?=
 LIBS_JPEG          ?= -ljpeg
 DEPEND_ON_MAKEFILE ?= yes
-DOWNLOAD_GAMEPACKS ?= yes
+# yes = download; all = even download undistributable gamepacks; no = disable; allinone = dl all-in-one compact fixed archive
+DOWNLOAD_GAMEPACKS ?= allinone
 INSTALL_DLLS       ?= yes
-# set to no to disable gamepack, set to all to even download undistributable gamepacks
 
 # Support CHECK_DEPENDENCIES with DOWNLOAD_GAMEPACKS semantics
 ifneq ($(CHECK_DEPENDENCIES),)
diff --git a/download-gamepacks.sh b/download-gamepacks.sh
index 2041af3d..f4b4dadb 100755
--- a/download-gamepacks.sh
+++ b/download-gamepacks.sh
@@ -82,6 +82,11 @@ pack()
 	esac
 	case " $LICENSEFILTER " in
 		"  ")
+			if [ "$license" == "allinone" ]; then
+				$ECHO "All-in-one pack skipped: only downloading it alone without other packs."
+				$ECHO
+				return
+			fi
 			;;
 		*" $license "*)
 			;;
@@ -195,3 +200,5 @@ pack WolfPack          proprietary svn    svn://svn.icculus.org/gtkradiant-gamep
 pack WoPPack           proprietary git    https://github.com/PadWorld-Entertainment/wop-mapeditor-support.git
 pack XonoticPack       GPL         git    https://gitlab.com/xonotic/netradiant-xonoticpack.git
 pack ZEQ2LitePack      unknown     git    https://gitlab.com/netradiant/gamepacks/zeq2lite-mapeditor-support.git
+
+pack NRCPack           allinone    zip1    https://www.dropbox.com/s/b1xpajzfa6yjlzf/netradiant-custom-extra-gamepacks.zip
diff --git a/install-gamepacks.sh b/install-gamepacks.sh
index df9a6b0d..44c7a3c0 100755
--- a/install-gamepacks.sh
+++ b/install-gamepacks.sh
@@ -11,6 +11,9 @@ case "$DOWNLOAD_GAMEPACKS" in
 	yes)
 		LICENSEFILTER=GPL BATCH=1 $SH download-gamepacks.sh
 		;;
+	allinone)
+		LICENSEFILTER=allinone BATCH=1 $SH download-gamepacks.sh
+		;;
 	all)
 		BATCH=1 $SH download-gamepacks.sh
 		;;