new gog installer version

9 files changed, 199 insertions, 178 deletions

diff --git a/.SRCINFO b/.SRCINFO
index edf861dab1b6..e2a4e196543c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,37 @@
 pkgbase = dungeon-keeper-gold-gog
 	pkgdesc = Construct and manage a dungeon, recruiting and catering for minions to run it and defend it from enemy invaders.
-	pkgver = 2.1.0.7
+	pkgver = 10.1
 	pkgrel = 1
 	url = https://www.gog.com/game/dungeon_keeper
 	install = dungeon-keeper-gold-gog.install
 	arch = any
 	groups = games
 	license = custom:eula
-	makedepends = innoextract
+	makedepends = innoextract-git
 	makedepends = icoutils
 	depends = dosbox
 	optdepends = unionfs-fuse: mounting game folder to home for savegames and settings
-	source = setup_dungeon_keeper_gold_2.1.0.7.exe::gogdownloader://dungeon_keeper/installer_win_en
+	source = setup_dungeon_keeper_gold_10.1_(28184).exe::gogdownloader://dungeon_keeper/installer_win_en
 	source = dungeon-keeper-gold-gog.sh
 	source = dungeon-keeper-gold-gog.desktop
+	source = dosboxdk_single.conf
+	source = dosboxdk_addon.conf
+	source = dosboxdk_client.conf
+	source = dosboxdk_server.conf
+	source = dosboxdk_settings.conf
 	source = dosbox_windowed.conf
 	source = dosbox_ipx.conf
-	source = simple-net-config.patch
-	source = fix-dosbox-mounts.patch
 	source = fix-permissions.sh
-	sha256sums = d92ba5f824ce123b281fda9f103d80a0c00af8be06e3c565b596894053233f29
+	sha256sums = 7c108532b5f0549c8c265ffa6ae7744a6d0f785856434b90911fa8276b031004
 	sha256sums = a7944e92e1109d5a741ac5147d9a82b911d5d67295d275e0db3bed076abc28fd
 	sha256sums = bdbab0f3525b380d81cea61713009251da55a13c222ee4b4117afec12e90d4f9
+	sha256sums = 06ae3f1330695dd990a32438f509a92960c4b4725bbeb1f29d8d155c6a50a722
+	sha256sums = 98bba4add1533899b9f52ccb85f47e019b612234c1440e936d028dc39b185f9d
+	sha256sums = 2fdfcf1543d1194bf88fb9064c3a8b3b83769c2d723220d4d637d4a60c1905b7
+	sha256sums = be5399a17a4769fe7c1fb66b25cef6ed8f0baff82d73233dcfb7d0f3a6c45ef4
+	sha256sums = f2f1742182bd7322f62c46e105172f9a634432a698309b58ed21961db02363c1
 	sha256sums = 50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578
 	sha256sums = e90b33464517fb8b8102f3667755302e01fa10b7bec3d660357f802685416ca8
-	sha256sums = 36f076e6e0aa21d51c98507e4036d30a93234c94dcb0f77752b7ce97caea4f0d
-	sha256sums = 0031fe886d4f163f38ae7a3cdfbafd0b7c43045aa16e4b23b128d0656a83a645
 	sha256sums = bbfa392edd4ac36e2c274d22b07bf2f9115e3f134b0b7c8b146538d2d0b36c2a
 
 pkgname = dungeon-keeper-gold-gog
diff --git a/PKGBUILD b/PKGBUILD
index e0cdf2c0f1c0..64bfbda3b014 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,40 @@
 # Maintainer: Constantin Nickel <constantin dot nickel at gmail dot com>
 
 pkgname=dungeon-keeper-gold-gog
-pkgver=2.1.0.7
+pkgver=10.1
 pkgrel=1
 pkgdesc="Construct and manage a dungeon, recruiting and catering for minions to run it and defend it from enemy invaders."
 url="https://www.gog.com/game/dungeon_keeper"
 license=('custom:eula')
 groups=('games')
 arch=('any')
-makedepends=('innoextract' 'icoutils')
+makedepends=('innoextract-git' 'icoutils')
 depends=('dosbox')
 optdepends=('unionfs-fuse: mounting game folder to home for savegames and settings')
 install=$pkgname.install
 
-source=("setup_dungeon_keeper_gold_$pkgver.exe"::"gogdownloader://dungeon_keeper/installer_win_en"
+source=("setup_dungeon_keeper_gold_${pkgver}_(28184).exe"::"gogdownloader://dungeon_keeper/installer_win_en"
         "dungeon-keeper-gold-gog.sh"
         "dungeon-keeper-gold-gog.desktop"
+        "dosboxdk_single.conf"
+        "dosboxdk_addon.conf"
+        "dosboxdk_client.conf"
+        "dosboxdk_server.conf"
+        "dosboxdk_settings.conf"
         "dosbox_windowed.conf"
         "dosbox_ipx.conf"
-        "simple-net-config.patch"
-        "fix-dosbox-mounts.patch"
         "fix-permissions.sh")
 
-sha256sums=('d92ba5f824ce123b281fda9f103d80a0c00af8be06e3c565b596894053233f29'
+sha256sums=('7c108532b5f0549c8c265ffa6ae7744a6d0f785856434b90911fa8276b031004'
             'a7944e92e1109d5a741ac5147d9a82b911d5d67295d275e0db3bed076abc28fd'
             'bdbab0f3525b380d81cea61713009251da55a13c222ee4b4117afec12e90d4f9'
+            '06ae3f1330695dd990a32438f509a92960c4b4725bbeb1f29d8d155c6a50a722'
+            '98bba4add1533899b9f52ccb85f47e019b612234c1440e936d028dc39b185f9d'
+            '2fdfcf1543d1194bf88fb9064c3a8b3b83769c2d723220d4d637d4a60c1905b7'
+            'be5399a17a4769fe7c1fb66b25cef6ed8f0baff82d73233dcfb7d0f3a6c45ef4'
+            'f2f1742182bd7322f62c46e105172f9a634432a698309b58ed21961db02363c1'
             '50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578'
             'e90b33464517fb8b8102f3667755302e01fa10b7bec3d660357f802685416ca8'
-            '36f076e6e0aa21d51c98507e4036d30a93234c94dcb0f77752b7ce97caea4f0d'
-            '0031fe886d4f163f38ae7a3cdfbafd0b7c43045aa16e4b23b128d0656a83a645'
             'bbfa392edd4ac36e2c274d22b07bf2f9115e3f134b0b7c8b146538d2d0b36c2a')
 
 # You need to download the gog.com installer file to this directory ($PWD),
@@ -40,10 +46,10 @@ DLAGENTS+=('gogdownloader::/usr/bin/awk BEGIN{print"Please\ download\ the\ file\
 
 prepare() {
     # extract installer (convert files to lowercase, as DOS does not care)
-    innoextract -e -L -d "$srcdir" setup_dungeon_keeper_gold_$pkgver.exe
+    innoextract -e -L -d "$srcdir"/setup "setup_dungeon_keeper_gold_${pkgver}_(28184).exe"
     # convert icon
-    icotool -x app/goggame-1207658934.ico
-    icotool -x app/gfw_high_addon.ico
+    icotool -x setup/goggame-1207658934.ico
+    icotool -x setup/gfw_high_addon.ico
     # create launchers
     sed "s/Dungeon Keeper/Deeper Dungeons/;s/dungeon-keeper/deeper-dungeons/" \
             $pkgname.desktop > deeper-dungeons.desktop
@@ -51,27 +57,26 @@ prepare() {
         sed "s|Exec=dungeon-keeper|& --$_m|;s|Name=Dungeon Keeper|& (${_m^})|" \
                     $pkgname.desktop > dungeon-keeper-$_m.desktop
     done
+
+    cp setup/__support/app/dosboxdk.conf "$srcdir"
+    cp setup/tmp/eula.txt "$srcdir"
+
     # remove bundled dosbox, windows stuff and gog client files
-    rm -rf app/{dosbox/,*.ico,*.dll,goggame-1207658934.*,*.zip,__support}
-    # simplified net config for start script
-    patch -p1 -i "$srcdir"/simple-net-config.patch
-    # fix mount directory
-    patch -p1 -i "$srcdir"/fix-dosbox-mounts.patch
+    rm -rf setup/{app,commonappdata,dosbox,tmp,*.ico,*.dll,goggame-1207658934.*,*.zip,__redist,__support}
 }
 
 package() {
     # data
     install -d "$pkgdir"/opt/dungeon-keeper-gold
-    cp -r app/* "$pkgdir"/opt/dungeon-keeper-gold
+    cp -r setup/* "$pkgdir"/opt/dungeon-keeper-gold
     # fix permissions script
     install -Dm755 fix-permissions.sh "$pkgdir"/opt/dungeon-keeper-gold
     # additional dosbox config
-    install -m644 dosbox_windowed.conf "$pkgdir"/opt/dungeon-keeper-gold
-    install -m644 dosbox_ipx.conf "$pkgdir"/opt/dungeon-keeper-gold
+    install -m644 *.conf "$pkgdir"/opt/dungeon-keeper-gold
     # doc + licenses
     install -d "$pkgdir"/usr/share/{doc,licenses}/$pkgname
     ln -s -t "$pkgdir"/usr/share/doc/$pkgname /opt/dungeon-keeper-gold/manual.pdf
-    install -m644 tmp/{gog_,}eula.txt "$pkgdir"/usr/share/licenses/$pkgname
+    install -m644 eula.txt "$pkgdir"/usr/share/licenses/$pkgname
     # .desktop files and launchers
     install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/dungeon-keeper.desktop
     install -Dm644 deeper-dungeons.desktop "$pkgdir"/usr/share/applications/deeper-dungeons.desktop
diff --git a/dosboxdk_addon.conf b/dosboxdk_addon.conf
new file mode 100644
index 000000000000..2c0d50754d94
--- /dev/null
+++ b/dosboxdk_addon.conf
@@ -0,0 +1,13 @@
+[ipx]

+# ipx -- Enable ipx over UDP/IP emulation.

+ipx=false

+

+[autoexec]

+# Lines in this section will be run at startup.

+@echo off

+mount C "."

+imgmount d "game.inst" -t iso -fs iso

+c:

+cls

+deeper.exe

+exit
\ No newline at end of file
diff --git a/dosboxdk_client.conf b/dosboxdk_client.conf
new file mode 100644
index 000000000000..eb16653eaf03
--- /dev/null
+++ b/dosboxdk_client.conf
@@ -0,0 +1,7 @@
+[ipx]

+ipx=true

+

+[autoexec]

+# Lines in this section will be run at startup.

+@echo off

+IPXNET CONNECT 127.0.0.1 19900
\ No newline at end of file
diff --git a/dosboxdk_server.conf b/dosboxdk_server.conf
new file mode 100644
index 000000000000..a1e21a459c7a
--- /dev/null
+++ b/dosboxdk_server.conf
@@ -0,0 +1,7 @@
+[ipx]

+ipx=true

+

+[autoexec]

+# Lines in this section will be run at startup.

+@echo off

+IPXNET STARTSERVER 19900
\ No newline at end of file
diff --git a/dosboxdk_settings.conf b/dosboxdk_settings.conf
new file mode 100644
index 000000000000..0a14bab5d551
--- /dev/null
+++ b/dosboxdk_settings.conf
@@ -0,0 +1,120 @@
+[sdl]

+fullscreen=false

+

+[ipx]

+# ipx -- Enable ipx over UDP/IP emulation.

+ipx=false

+

+[autoexec]

+@echo off

+mount C "."

+imgmount d "game.inst" -t iso -fs iso

+c:

+cls

+

+@ECHO ÉÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ» 

+@ECHO º ----------------------------- º 

+@ECHO º Dungeon Keeper GOLD Settings  º 

+@ECHO º ----------------------------- º 

+@ECHO º 1) Sound Settings             º 

+@ECHO º 2) Language Settings          º 

+@ECHO º ----------------------------- º 

+@ECHO º 3) Exit program               º 

+@ECHO º ----------------------------- º 

+@ECHO ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍͼ

+@ECHO on 

+@ECHO off

+@choice /c123 /s Which section do you want to run? [1-3]: /n 

+if errorlevel 3 goto exit

+if errorlevel 2 goto lang

+if errorlevel 1 goto sound

+

+:sound

+cls

+cd sound

+setsound.exe

+exit

+

+:lang

+cls

+@ECHO ÉÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ» 

+@ECHO º ----------------------------- º

+@ECHO º  Language Settings            º

+@ECHO º ----------------------------- º 

+@ECHO º  1) English                   º

+@ECHO º  2) Dutch                     º

+@ECHO º  3) French                    º

+@ECHO º  4) Polish                    º

+@ECHO º  5) Spanish                   º

+@ECHO º  6) Swedish                   º

+@ECHO º  7) German                    º

+@ECHO º  8) Italian (text only)       º

+@ECHO º ----------------------------- º 

+@ECHO º  9) Exit without change       º

+@ECHO º ----------------------------- º 

+@ECHO ÈÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍͼ

+@ECHO on 

+@ECHO off

+@choice /c123456789 /s Select game language: [1-9]: /n 

+if errorlevel 9 goto exit

+if errorlevel 8 goto ITA

+if errorlevel 7 goto GER

+if errorlevel 6 goto SWE

+if errorlevel 5 goto SPA

+if errorlevel 4 goto POL

+if errorlevel 3 goto FRE

+if errorlevel 2 goto DUT

+if errorlevel 1 goto ENG

+

+:ENG

+set DKLANG1=english

+set DKLANG2=English

+goto copyres

+

+:DUT

+set DKLANG1=dutch

+set DKLANG2=Dutch

+goto copyres

+

+:FRE

+set DKLANG1=french

+set DKLANG2=French

+goto copyres

+

+:POL

+set DKLANG1=polish

+set DKLANG2=Polish

+goto copyres

+

+:SPA

+set DKLANG1=spanish

+set DKLANG2=Spanish

+goto copyres

+

+:SWE

+set DKLANG1=swedish

+set DKLANG2=Swedish

+goto copyres

+

+:GER

+set DKLANG1=german

+set DKLANG2=German

+goto copyres

+

+:ITA

+set DKLANG1=english

+set DKLANG2=Italian

+goto copyres

+

+:copyres

+COPY d:\keeper\sound\atlas\%DKLANG1%\*.* c:\sound\atlas\*.*

+COPY d:\keeper\sound\speech\%DKLANG1%\SPEECH.DAT c:\sound\SPEECH.DAT

+COPY d:\keeper\data\%DKLANG2%\DD1TEXT.DAT c:\data\DD1TEXT.dat

+COPY d:\keeper\data\%DKLANG2%\TEXT.DAT c:\data\TEXT.DAT

+cls

+ECHO Language successfully changed to %DKLANG2%

+pause

+exit

+

+:exit

+exit

diff --git a/dosboxdk_single.conf b/dosboxdk_single.conf
new file mode 100644
index 000000000000..48f4113dcbea
--- /dev/null
+++ b/dosboxdk_single.conf
@@ -0,0 +1,13 @@
+[ipx]

+# ipx -- Enable ipx over UDP/IP emulation.

+ipx=false

+

+[autoexec]

+# Lines in this section will be run at startup.

+@echo off

+mount C "."

+imgmount d "game.inst" -t iso -fs iso

+c:

+cls

+keeper.exe

+exit
\ No newline at end of file
diff --git a/fix-dosbox-mounts.patch b/fix-dosbox-mounts.patch
deleted file mode 100644
index 4cea8229db9d..000000000000
--- a/fix-dosbox-mounts.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/app/dosboxdk_addon.conf b/app/dosboxdk_addon.conf
---- a/app/dosboxdk_addon.conf
-+++ b/app/dosboxdk_addon.conf
-@@ -5,8 +5,8 @@ ipx=false
- [autoexec]

- # Lines in this section will be run at startup.

- @echo off

--mount C ".."

--imgmount d "..\game.inst" -t iso -fs iso

-+mount C "."

-+imgmount d "game.inst" -t iso -fs iso

- c:

- cls

- deeper.exe

-diff --git a/app/dosboxdk_settings.conf b/app/dosboxdk_settings.conf
---- a/app/dosboxdk_settings.conf
-+++ b/app/dosboxdk_settings.conf
-@@ -7,8 +7,8 @@ ipx=false
- 

- [autoexec]

- @echo off

--mount c ".."

--imgmount d "..\game.inst" -t iso -fs iso

-+mount C "."

-+imgmount d "game.inst" -t iso -fs iso

- c:

- cls

- 

-diff --git a/app/dosboxdk_single.conf b/app/dosboxdk_single.conf
---- a/app/dosboxdk_single.conf
-+++ b/app/dosboxdk_single.conf
-@@ -5,8 +5,8 @@ ipx=false
- [autoexec]

- # Lines in this section will be run at startup.

- @echo off

--mount C ".."

--imgmount d "..\game.inst" -t iso -fs iso

-+mount C "."

-+imgmount d "game.inst" -t iso -fs iso

- c:

- cls

- keeper.exe

diff --git a/simple-net-config.patch b/simple-net-config.patch
deleted file mode 100644
index c5d47ae6626a..000000000000
--- a/simple-net-config.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff --git a/app/dosboxdk_client.conf b/app/dosboxdk_client.conf
---- a/app/dosboxdk_client.conf
-+++ b/app/dosboxdk_client.conf
-@@ -3,47 +3,5 @@ ipx=true
- 

- [autoexec]

- # Lines in this section will be run at startup.

--echo off

--cls

--IPXNET CONNECT 127.0.0.1

--cls

--@ECHO 

--@ECHO  ----------------------------

--@ECHO  Dungeon Keeper GOLD

--@ECHO  ----------------------------

--@ECHO     *MULTIPLAYER - CLIENT*  

--@ECHO on

--@ECHO off

--@ECHO  1) Dungeon Keeper

--@ECHO  2) Deeper Dungeons

--@ECHO on

--@ECHO off

--@ECHO  ----------------------------

--@ECHO  3) exit program             

--@ECHO  ----------------------------

--@ECHO 

--@ECHO on 

--@ECHO off

--@choice /c123 /s Which game do you want to run? [1-3]: /n 

--if errorlevel 3 goto exit

--if errorlevel 2 goto deeper

--if errorlevel 1 goto keeper

--

--:keeper

--mount C ".."

--imgmount d "..\game.inst" -t iso -fs iso

--c:

--cls

--keeper.exe

--exit

--

--:deeper

--mount C ".."

--imgmount d "..\game.inst" -t iso -fs iso

--c:

--cls

--deeper.exe

--exit

--

--:exit

--exit

-+@echo off

-+IPXNET CONNECT 127.0.0.1 19900
-\ No newline at end of file
-diff --git a/app/dosboxdk_server.conf b/app/dosboxdk_server.conf
---- a/app/dosboxdk_server.conf
-+++ b/app/dosboxdk_server.conf
-@@ -4,48 +4,4 @@ ipx=true
- [autoexec]

- # Lines in this section will be run at startup.

- @echo off

--cls

--IPXNET STARTSERVER

--cls

--@ECHO 

--@ECHO  ----------------------------

--@ECHO  Dungeon Keeper GOLD

--@ECHO  ----------------------------

--@ECHO     *MULTIPLAYER - HOST*  

--@ECHO on

--@ECHO off

--@ECHO  1) Dungeon Keeper

--@ECHO  2) Deeper Dungeons

--@ECHO on

--@ECHO off

--@ECHO  ----------------------------

--@ECHO  3) exit program             

--@ECHO  ----------------------------

--@ECHO 

--@ECHO on 

--@ECHO off

--@choice /c123 /s Which game do you want to run? [1-3]: /n 

--if errorlevel 3 goto exit

--if errorlevel 2 goto deeper

--if errorlevel 1 goto keeper

--

--:keeper

--cls

--mount C ".."

--imgmount d "..\game.inst" -t iso -fs iso

--c:

--cls

--keeper.exe

--exit

--

--:deeper

--cls

--mount C ".."

--imgmount d "..\game.inst" -t iso -fs iso

--c:

--cls

--deeper.exe

--exit

--

--:exit

--exit

-+IPXNET STARTSERVER 19900
-\ No newline at end of file