[game-data-packager] 01/01: keen: enable alternative archive, GDP will still download smaller other anyway

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 82cbc973edaf9de2b19e59c4cdc2ef2fb01336a9
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Wed May 10 09:38:49 2017 +0200

    keen: enable alternative archive, GDP will still download smaller other anyway
    
    This yaml file is fine, but GDP code needs some tweaking
    to silence this extraneous warning when package
    'dynamite' is not installed.
    
    WARNING:game_data_packager.build:cannot unpack "CK4SW14.SHR": tool "id-shr-extract" is not installed
---
 data/keen.yaml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/data/keen.yaml b/data/keen.yaml
index cffbf35..10038da 100644
--- a/data/keen.yaml
+++ b/data/keen.yaml
@@ -55,9 +55,8 @@ files:
     - gamemaps.ck6?1.4
     - gamemaps.ck6?1.5
 
-# This contains exactly the same files as
-# ftp://ftp.3drealms.com/share/4keen.zip
-# (but the latter requires running an installer)
+# this file is smaller than 4keen.zip,
+# so GDP will always try to download this one first
   4keen14.zip:
     download: http://spatang.com/files/4keen14.zip
     unpack:
@@ -67,6 +66,23 @@ files:
     - egagraph.ck4?1.43d
     - gamemaps.ck4
 
+  4keen.zip:
+    unpack:
+      format: zip
+    provides:
+    # INSTALL.EXE
+    # FILE_ID.DIZ
+    - CK4SW14.SHR
+
+  CK4SW14.SHR:
+    download: ftp://ftp.3drealms.com/share/4keen.zip
+    unpack:
+      format: id-shr-extract
+    provides:
+    - audio.ck4
+    - egagraph.ck4?1.43d
+    - gamemaps.ck4
+
 # Data below covers:
 # - Commander Keen 4, version 1.4 (EGA only, from 3D Realms and
 #   Goodtimes Software as included in the Id Anthology)
@@ -76,6 +92,8 @@ files:
 
 size_and_md5: |
   592887    1470ba6a18df1b315380b194b28a7a27 4keen14.zip
+  729683    29cf97c6e636cf167ba22d0b12af9d43 4keen.zip
+  659074    49b3565e48c9458e60927053e8cc8c6c CK4SW14.SHR
   33325     125c93a549a3e5b2ab4c6c6ec1ad3e7d audio.ck4
   101990    d080b7c53b0b374813a7479b559d4eb4 audio.ck5
   56265     8078f8106cca87fe7bea6b0dca798e5b audio.ck6
@@ -96,6 +114,8 @@ size_and_md5: |
 
 sha1sums: |
   bde2a69ad5ea36601dcfeb6dbfe2232fcc486161 4keen14.zip
+  401b3ee98f633043ebd8bc7fbe0c397e60cc0558 4keen.zip
+  e16308782c4fbf965bdb7d81d67a856f755e7aeb CK4SW14.SHR
   66baf85b886b3b1f1882b40d0e8061af19187453 audio.ck4
   5ded3b6afde6e102b9ea7e39887fc94899eb3476 audio.ck5
   d83153a4b5caea106fb3eb729edbe2271955648f audio.ck6
@@ -116,6 +136,8 @@ sha1sums: |
 
 sha256sums: |
   2fa260d48a1c7710c819e89594fff727ba6bc3e42065b5d8cedeccea256c2983 4keen14.zip
+  f7c63feb8bbec817646d95aa26313df1654c01eda8f7ccc5cfd0c0bc0b5e305e 4keen.zip
+  1828b1db5e44bbefa7b1f31595272dd53067165a0ec86d0179f8558a6049a2e5 CK4SW14.SHR
   66dcf6070a4bc5c8933815b15dab7145ddcccb959f8f43af2a0449b085a04366 audio.ck4
   1a9aae3de1d43d02334e1ad3b5063b64fd71766aed5e574431d7b3fdd3bfd02f audio.ck5
   5eef576c62773bc7c54c2c55c56117dd89ae7aba1d826f1bd201a8699d07b0e3 audio.ck6

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git