new gog installer version

5 files changed, 31 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c323b2f80cb..974408f3dcd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,31 @@
 pkgbase = battle-isle2-gog
 	pkgdesc = A turn-based tactics game which tells the story about the wars on the fictional planet, Chromos.
-	pkgver = 2.2.0.20
+	pkgver = 1.0
 	pkgrel = 1
 	url = https://www.gog.com/game/battle_isle_platinum
 	install = battle-isle2-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_battle_isle2_2.2.0.20.exe::gogdownloader://battle_isle2/installer_win_en
+	source = setup_battle_isle_2_1.0_(28043).exe::gogdownloader://battle_isle2/installer_win_en
 	source = battle-isle2-gog.sh
 	source = battle-isle2-gog.desktop
 	source = dosboxbi2_main.conf
 	source = dosboxbi2_addon.conf
 	source = dosbox_windowed.conf
 	source = fix-image-cue.patch
-	source = fix-dosbox-mounts.patch
 	source = fix-permissions.sh
-	sha256sums = 8376ed695366a5495c216ca0ebf7153138318fa2ebff1c78a272b32b89dcbe6f
-	sha256sums = e59720ae6e516c7d78c1174d827ab90e49f084bff5c00204b6d717b1de2ab8cc
+	sha256sums = cbb7bef8cbac55e6b29468ad84c956b55be5bf2792e5986544617f5af3af607b
+	sha256sums = 7cad76a7579457e41e7ea29096c1eda0aa5b57d5173973083c86190bb7cb7140
 	sha256sums = bb5c13954638d030c740805153aa25db3f94b21e0acef895022f1967d796fed4
 	sha256sums = 0331176b6b3e5505cb81e805cd90a3130bd861403b300b46ca7445aab4b2ca1a
 	sha256sums = 9407e1f77e8ccf1ed20504c42ce13560938e0d5b2412ae249d578a96acad8719
 	sha256sums = 50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578
-	sha256sums = c2164249e7e5968ad356001599f6301c5652bd8d4bed42d36f317ca92b4b2612
-	sha256sums = 1c1917bccab3e7ba21b4a518634122715809a62a9b09cf8a72c9a794db3f02fb
+	sha256sums = 0b4e0e2a45a6277db319d9445bed0ed899f5f54e32e929a6415477d0d1e0af14
 	sha256sums = f85afa50c4adaf6c9c160da79b6ad77eadf334813f7bdb90eccbaf25bf85d54f
 
 pkgname = battle-isle2-gog
diff --git a/PKGBUILD b/PKGBUILD
index 25c36e8d60ae..2629364b9f4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,34 @@
 # Maintainer: Constantin Nickel <constantin dot nickel at gmail dot com>
 
 pkgname=battle-isle2-gog
-pkgver=2.2.0.20
+pkgver=1.0
 pkgrel=1
 pkgdesc="A turn-based tactics game which tells the story about the wars on the fictional planet, Chromos."
 url="https://www.gog.com/game/battle_isle_platinum"
 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_battle_isle2_$pkgver.exe"::"gogdownloader://battle_isle2/installer_win_en"
+source=("setup_battle_isle_2_${pkgver}_(28043).exe"::"gogdownloader://battle_isle2/installer_win_en"
         "battle-isle2-gog.sh"
         "battle-isle2-gog.desktop"
         "dosboxbi2_main.conf"
         "dosboxbi2_addon.conf"
         "dosbox_windowed.conf"
         "fix-image-cue.patch"
-        "fix-dosbox-mounts.patch"
         "fix-permissions.sh")
 
-sha256sums=('8376ed695366a5495c216ca0ebf7153138318fa2ebff1c78a272b32b89dcbe6f'
-            'e59720ae6e516c7d78c1174d827ab90e49f084bff5c00204b6d717b1de2ab8cc'
+sha256sums=('cbb7bef8cbac55e6b29468ad84c956b55be5bf2792e5986544617f5af3af607b'
+            '7cad76a7579457e41e7ea29096c1eda0aa5b57d5173973083c86190bb7cb7140'
             'bb5c13954638d030c740805153aa25db3f94b21e0acef895022f1967d796fed4'
             '0331176b6b3e5505cb81e805cd90a3130bd861403b300b46ca7445aab4b2ca1a'
             '9407e1f77e8ccf1ed20504c42ce13560938e0d5b2412ae249d578a96acad8719'
             '50b601b33522677a9bcaf23edc833329067bb87ccda33039c0b95f0d4ddca578'
-            'c2164249e7e5968ad356001599f6301c5652bd8d4bed42d36f317ca92b4b2612'
-            '1c1917bccab3e7ba21b4a518634122715809a62a9b09cf8a72c9a794db3f02fb'
+            '0b4e0e2a45a6277db319d9445bed0ed899f5f54e32e929a6415477d0d1e0af14'
             'f85afa50c4adaf6c9c160da79b6ad77eadf334813f7bdb90eccbaf25bf85d54f')
 
 # You need to download the gog.com installer file to this directory ($PWD),
@@ -42,34 +40,34 @@ 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_battle_isle2_$pkgver.exe
+    innoextract -e -L -d "$srcdir"/setup "setup_battle_isle_2_${pkgver}_(28043).exe"
     # convert icon
-    icotool -x app/goggame-1207661073.ico
+    icotool -x setup/goggame-1207661073.ico
     # create launchers
     sed "s|Exec=battle-isle2|& --addon|;s|Name=Battle Isle 2|&: Titan's Legacy|" \
             $pkgname.desktop > battle-isle2-addon.desktop
+
+    cp setup/__support/app/dosboxbi2.conf "$srcdir"
+    cp setup/tmp/eula.txt "$srcdir"
+
     # remove bundled dosbox, windows stuff and gog client files
-    rm -rf app/{dosbox/,*.ico,*.dll,goggame-1207661073.*,*.zip,__support}
+    rm -rf setup/{app,commonappdata,dosbox,tmp,*.ico,*.dll,goggame-1207661073.*,*.zip,__redist,__support}
     # fix image cue
     patch -p1 -i "$srcdir"/fix-image-cue.patch
-    # fix mount directory
-    patch -p1 -i "$srcdir"/fix-dosbox-mounts.patch
 }
 
 package() {
     # data
     install -d "$pkgdir"/opt/battle-isle2
-    cp -r app/* "$pkgdir"/opt/battle-isle2
+    cp -r setup/* "$pkgdir"/opt/battle-isle2
     # fix permissions script
     install -Dm755 fix-permissions.sh "$pkgdir"/opt/battle-isle2
     # additional dosbox config
-    install -m644 dosbox_windowed.conf "$pkgdir"/opt/battle-isle2
-    install -m644 dosboxbi2_main.conf "$pkgdir"/opt/battle-isle2
-    install -m644 dosboxbi2_addon.conf "$pkgdir"/opt/battle-isle2
+    install -m644 *.conf "$pkgdir"/opt/battle-isle2
     # doc + licenses
     install -d "$pkgdir"/usr/share/{doc,licenses}/$pkgname
     ln -s -t "$pkgdir"/usr/share/doc/$pkgname /opt/battle-isle2/{manual.pdf,scenery\ -\ 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/battle-isle2.desktop
     install -Dm755 $pkgname.sh "$pkgdir"/usr/bin/battle-isle2
diff --git a/battle-isle2-gog.sh b/battle-isle2-gog.sh
index 502ab4ead876..457fdb19e65f 100644
--- a/battle-isle2-gog.sh
+++ b/battle-isle2-gog.sh
@@ -7,12 +7,10 @@ cat <<EOF
             -h  --help          Show this message
                 --windowed      Windowed mode
                 --addon         Battle Isle 2 Scenery CD: Titan's Legacy
-                --single        Use original gog startup config
     Examples:
 
     $script --windowed
-    $script --client
-    $script --server --addon
+    $script --addon
 EOF
     exit 0
 }
@@ -29,7 +27,7 @@ fi
 
 script=${0##*/}
 
-TEMP=$(getopt -o h --long help,windowed,addon,single \
+TEMP=$(getopt -o h --long help,windowed,addon \
      -n "$script" -- "$@")
 
 if [ $? != 0 ] ; then exit 1 ; fi
@@ -40,7 +38,6 @@ while true; do
     case "$1" in
         -h|--help) _help; shift ;;
         --windowed) WINDOWED=1; shift ;;
-        --single) START_SINGLE=1; shift ;;
         --addon) START_ADDON=1; shift ;;
         --) shift; break ;;
     esac
@@ -52,9 +49,7 @@ if [ "$WINDOWED" ]; then
     configs+=('-conf' 'dosbox_windowed.conf')
 fi
 
-if [ "$START_SINGLE" ]; then
-    configs+=('-conf' 'dosboxbi2_single.conf')
-elif [ "$START_ADDON" ] ; then
+if [ "$START_ADDON" ] ; then
     configs+=('-conf' 'dosboxbi2_addon.conf')
 else
     configs+=('-conf' 'dosboxbi2_main.conf')
diff --git a/fix-dosbox-mounts.patch b/fix-dosbox-mounts.patch
deleted file mode 100644
index 959db281ee83..000000000000
--- a/fix-dosbox-mounts.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/app/dosboxbi2_single.conf b/app/dosboxbi2_single.conf
---- a/app/dosboxbi2_single.conf
-+++ b/app/dosboxbi2_single.conf
-@@ -25,8 +25,8 @@ if errorlevel 1 goto isle2
- 

- :isle2

- cls

--mount C "..\ISLE2"

--imgmount d "..\ISLE2\BI2.inst" -t iso -fs iso

-+mount C "isle2"

-+imgmount d "isle2/bi2.inst" -t iso -fs iso

- c:

- cls

- @BATTLE2.EXE ENG

-@@ -34,8 +34,8 @@ exit
- 

- :scenery

- cls

--mount C "..\SCENERY"

--imgmount d "..\SCENERY\BI2scen.inst" -t iso -fs iso

-+mount C "scenery"

-+imgmount d "scenery/bi2scen.inst" -t iso -fs iso

- c:

- cls

- @INTRO.EXE

diff --git a/fix-image-cue.patch b/fix-image-cue.patch
index 840c8358de0e..b4abd52767a5 100644
--- a/fix-image-cue.patch
+++ b/fix-image-cue.patch
@@ -1,15 +1,15 @@
-diff --git a/app/isle2/bi2.inst b/app/isle2/bi2.inst
---- a/app/isle2/bi2.inst
-+++ b/app/isle2/bi2.inst
+diff --git a/setup/isle2/bi2.inst b/setup/isle2/bi2.inst
+--- a/setup/isle2/bi2.inst
++++ b/setup/isle2/bi2.inst
 @@ -1,4 +1,4 @@
 -FILE "BI2.gog" BINARY

 +FILE "bi2.gog" BINARY

    TRACK 01 MODE1/2352

      INDEX 01 00:00:00

  FILE "bi202.ogg" MP3

-diff --git a/app/scenery/bi2scen.inst b/app/scenery/bi2scen.inst
---- a/app/scenery/bi2scen.inst
-+++ b/app/scenery/bi2scen.inst
+diff --git a/setup/scenery/bi2scen.inst b/setup/scenery/bi2scen.inst
+--- a/setup/scenery/bi2scen.inst
++++ b/setup/scenery/bi2scen.inst
 @@ -1,4 +1,4 @@
 -FILE "BI2scen.gog" BINARY

 +FILE "bi2scen.gog" BINARY