Use /verysilent for install

Use icotools for shortcut generation

5 files changed, 69 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb5834a50cd4..877a7f735730 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,12 +11,18 @@ pkgbase = gog-heroes-of-might-and-magic-3-complete-edition
 	depends = wine
 	source = setup_homm3_complete_4.0.25024.exe::gogdownloader://heroes_of_might_and_magic_3_complete_edition/en1installer0
 	source = setup_homm3_complete_4.0.25024-1.bin::gogdownloader://heroes_of_might_and_magic_3_complete_edition/en1installer1
+	source = gog-heroes-of-might-and-magic-3-complete-edition.desktop
+	source = gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor.desktop
+	source = gog-heroes-of-might-and-magic-3-complete-edition-map-editor.desktop
 	source = gog-heroes-of-might-and-magic-3-complete-edition
 	source = gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor
 	source = gog-heroes-of-might-and-magic-3-complete-edition-map-editor
 	source = gog-heroes-of-might-and-magic-3-complete-edition.install
 	sha256sums = 76af0bfa9ddb1889ff0fe516599f21e3f2a696dd5baaf74333b5b58cc425a0e1
 	sha256sums = a7b6d9f13bc6924d515eaa39430b290b80fd4253b2d1c40e9d936c4d242a466f
+	sha256sums = ab14524f06cb213ee0b1e5bcd5d9089da9e66057794430347d32a60a86a945fd
+	sha256sums = de064d9bc819403dc5990fd70d81c88d63d708ba5b4e02015cc616e77338c478
+	sha256sums = 4dc5f7d1bd44405dae2969ec093ef6ce680aec889024b68350023feb4a12ee1b
 	sha256sums = bb1cec5ef9de917ae69bb04d661d843986b038a277871557387cd66c7292604d
 	sha256sums = 2165809683969955bca129f1960efa5111aaa703ac891df29b809f4ce5b30eaa
 	sha256sums = 5265ae79418a0c376d2f98cc52c5fc2ed34af802080e00c229754efe9f8e91d6
diff --git a/PKGBUILD b/PKGBUILD
index 3facb366e729..63787895e9b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,19 +13,26 @@ groups=("games")
 
 source=("setup_homm3_complete_${pkgver}.exe::gogdownloader://${_gamename}/en1installer0"
         "setup_homm3_complete_${pkgver}-1.bin::gogdownloader://${_gamename}/en1installer1"
-        #"http://h3hota.com/HD/HoMM3%20HD%20Latest.exe"
+        # "http://h3hota.com/HD/HoMM3%20HD%20Latest.exe"
+        "${pkgname}.desktop"
+        "${pkgname}-campaign-editor.desktop"
+        "${pkgname}-map-editor.desktop"
         "${pkgname}"
         "${pkgname}-campaign-editor"
         "${pkgname}-map-editor"
         "${pkgname}.install")
 sha256sums=('76af0bfa9ddb1889ff0fe516599f21e3f2a696dd5baaf74333b5b58cc425a0e1'
             'a7b6d9f13bc6924d515eaa39430b290b80fd4253b2d1c40e9d936c4d242a466f'
-#            'SKIP'
+            # 'SKIP'
+            'ab14524f06cb213ee0b1e5bcd5d9089da9e66057794430347d32a60a86a945fd'
+            'de064d9bc819403dc5990fd70d81c88d63d708ba5b4e02015cc616e77338c478'
+            '4dc5f7d1bd44405dae2969ec093ef6ce680aec889024b68350023feb4a12ee1b'
             'bb1cec5ef9de917ae69bb04d661d843986b038a277871557387cd66c7292604d'
             '2165809683969955bca129f1960efa5111aaa703ac891df29b809f4ce5b30eaa'
             '5265ae79418a0c376d2f98cc52c5fc2ed34af802080e00c229754efe9f8e91d6'
             '6c6d7f19bcca181ee5c1c51c9f15e8d12d95e1feabcd676d1a41fc377f050d37')
 depends=(wine)
+makedepends=(icoutils)
 
 # Register lgogdownloader as a download agent
 DLAGENTS+=('gogdownloader::/usr/bin/lgogdownloader --download-file=%u -o %o')
@@ -38,15 +45,21 @@ build() {
   export XDG_DATA_HOME="$srcdir"/tmp/local
 
   install -m755 -d "$srcdir"/tmp "$srcdir"/tmp/env "$srcdir"/tmp/local
-  msg "Running GOG installer (Don't customize or launch game)"
-  wine "${srcdir}/setup_homm3_complete_${pkgver}.exe"
-  # Unfortunately, /verysilent doesn't work
-  # messagebox from showing up and blocking. Manual intervention is required
-#  msg "Installing HD patch"
-#  wine "${srcdir}/${_gamehdpatchname}" /verysilent
+
+  msg "Running GOG installer"
+  wine "${srcdir}/setup_homm3_complete_${pkgver}.exe" /LOG=$(tty) /Dir="${srcdir}/${pkgname#gog-}" /NoIcons=0 /verysilent # /LANG=english /?
+
+  # msg "Installing HD patch"
+  # wine "${srcdir}/${_gamehdpatchname}" /verysilent
+
   msg "Extracting HKEY_LOCAL_MACHINE registry"
   regedit -e ${srcdir}/local_machine.reg "HKEY_LOCAL_MACHINE\Software\New World Computing"
   sed -i 's,C:\\\\GOG Games\\\\homm 3 complete,Z:\\\\opt\\\\gog\\\\homm 3 complete,g' local_machine.reg
+
+  msg "Generating Icons"
+  mkdir -p "${srcdir}"/icons
+  wrestool -x -t14 -o "${srcdir}"/icons "${srcdir}/${pkgname#gog-}/"{Heroes3,h3maped,h3ccmped}.exe
+  icotool -x -o "${srcdir}"/icons "${srcdir}"/icons/*.ico
 }
 
 package() {
@@ -54,12 +67,12 @@ package() {
   install -Dm644 ${srcdir}/local_machine.reg ${pkgdir}/usr/share/${pkgname}/local_machine.reg
 
   # Install license
-  install -Dm644 "${srcdir}/tmp/env/drive_c/GOG Games/HoMM 3 Complete/EULA.txt" "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 "${srcdir}/${pkgname#gog-}/EULA.txt" "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 
   # Install game
   install -m755 -d "${pkgdir}"/opt/gog/
   # mv instead of cp to save disk space
-  mv "${srcdir}/tmp/env/drive_c/GOG Games/HoMM 3 Complete" ${pkgdir}/opt/gog/${pkgname#gog-}
+  mv ${srcdir}/${pkgname#gog-} ${pkgdir}/opt/gog/${pkgname#gog-}
   # Remove unneeded files
   rm -rf ${pkgdir}/opt/gog/${pkgname#gog-}/unins*
   rm -rf ${pkgdir}/opt/gog/${pkgname#gog-}/*.lnk
@@ -75,24 +88,15 @@ package() {
   #done
   
   # Install .desktop file and icons
-  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Heroes of Might and Magic 3 Complete.desktop" ${pkgdir}/usr/share/applications/${pkgname}.desktop
-  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Tools/Map Editor.desktop"                  ${pkgdir}/usr/share/applications/${pkgname}-map-editor.desktop
-  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Tools/Campaign Editor.desktop"             ${pkgdir}/usr/share/applications/${pkgname}-campaign-editor.desktop
-  for res in 16 32 48 256
-  do
-    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/303B_goggame-1207658787.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}.png
-  done
-  for res in 16 32 48 64
-  do
-    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/FE0B_h3maped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-map-editor.png
-    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/8095_h3ccmped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-campaign-editor.png
-  done
-  # Edit out wine jumbled entries from .desktop file
-  for file in ${pkgname} ${pkgname}-map-editor ${pkgname}-campaign-editor
+  install -Dm644 "${srcdir}/${pkgname}.desktop"                  ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 "${srcdir}/${pkgname}-map-editor.desktop"       ${pkgdir}/usr/share/applications/${pkgname}-map-editor.desktop
+  install -Dm644 "${srcdir}/${pkgname}-campaign-editor.desktop"  ${pkgdir}/usr/share/applications/${pkgname}-campaign-editor.desktop
+
+  for res in 16 32 48
   do
-    sed -i "/^Path=\|^Version=\|^Terminal=\|^Categories/d" ${pkgdir}/usr/share/applications/${file}.desktop
-    sed -i "s,^\(Exec=\|Icon=\).*,\1${file}," ${pkgdir}/usr/share/applications/${file}.desktop
-    printf "Version=${pkgver}\nTerminal=false\nCategories=Game;\n" >> ${pkgdir}/usr/share/applications/${file}.desktop
+    install -Dm644 ${srcdir}/icons/Heroes3.exe*${res}x${res}x8.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}.png
+    install -Dm644 ${srcdir}/icons/h3maped.exe*${res}x${res}x8.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-map-editor.png
+    install -Dm644 ${srcdir}/icons/h3ccmped.exe*${res}x${res}x8.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}-campaign-editor.png
   done
   
   # Install startup scripts
diff --git a/gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor.desktop b/gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor.desktop
new file mode 100644
index 000000000000..e6f52bdb336d
--- /dev/null
+++ b/gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Campaign Editor
+Exec=gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor
+Type=Application
+StartupNotify=true
+Comment=Campaign Editor
+Icon=gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor
+StartupWMClass=h3ccmped.exe
+Version=4.0.10665
+Terminal=false
+Categories=Game;
diff --git a/gog-heroes-of-might-and-magic-3-complete-edition-map-editor.desktop b/gog-heroes-of-might-and-magic-3-complete-edition-map-editor.desktop
new file mode 100644
index 000000000000..22a4b12e16b2
--- /dev/null
+++ b/gog-heroes-of-might-and-magic-3-complete-edition-map-editor.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Map Editor
+Exec=gog-heroes-of-might-and-magic-3-complete-edition-map-editor
+Type=Application
+StartupNotify=true
+Comment=Map Editor
+Icon=gog-heroes-of-might-and-magic-3-complete-edition-map-editor
+StartupWMClass=h3maped.exe
+Version=4.0.10665
+Terminal=false
+Categories=Game;
diff --git a/gog-heroes-of-might-and-magic-3-complete-edition.desktop b/gog-heroes-of-might-and-magic-3-complete-edition.desktop
new file mode 100644
index 000000000000..9a25407764ee
--- /dev/null
+++ b/gog-heroes-of-might-and-magic-3-complete-edition.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Heroes of Might and Magic 3 Complete
+Exec=gog-heroes-of-might-and-magic-3-complete-edition
+Type=Application
+StartupNotify=true
+Icon=gog-heroes-of-might-and-magic-3-complete-edition
+StartupWMClass=heroes3.exe
+Version=4.0.10665
+Terminal=false
+Categories=Game;