move dot files to local share

6 files changed, 39 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc36fde1d8b8..eb47b1d2be2c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gog-heroes-of-might-and-magic-3-complete-edition
 	pkgdesc = Heroes of Might & Magic III and its expansions: Armageddon's Blade and The Shadow of Death (with HD patch)
 	pkgver = 2.0.1.17
-	pkgrel = 5
+	pkgrel = 6
 	url = https://www.gog.com/game/heroes_of_might_and_magic_3_complete_edition
 	arch = i686
 	arch = x86_64
@@ -11,15 +11,15 @@ pkgbase = gog-heroes-of-might-and-magic-3-complete-edition
 	depends = wine
 	source = setup_homm3_complete_2.0.0.16.exe::gogdownloader://heroes_of_might_and_magic_3_complete_edition/en1installer1
 	source = patch_heroes_of_might_and_magic_3_complete_2.0.1.17.exe::gogdownloader://heroes_of_might_and_magic_3_complete_edition/en1patch1
-	source = heroes-of-might-and-magic-3-complete-edition
-	source = heroes-of-might-and-magic-3-complete-edition-map-editor
-	source = heroes-of-might-and-magic-3-complete-edition-campaign-editor
+	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 = d90bed0fd7e5338045f5f9983fdc7390297025ac1accdbc2f9bbec217a066468
 	sha256sums = 9c6ca90dacc621f0bb333a3f5fb6df8b06af2afee571beea14782c989177ff5a
-	sha256sums = 23dae6e2e75384498e67f8b0c681b5a10f28f950053582815e27ac25684a6d68
-	sha256sums = bc5f57dd8fe1c4cb9bc4f144eea686a61ccc19e5020e446796f8f4c79014c8be
-	sha256sums = f7b58168872ce04bfad2ef151632762d29735f3e165bc5c4cf887df68de62ed2
+	sha256sums = bb1cec5ef9de917ae69bb04d661d843986b038a277871557387cd66c7292604d
+	sha256sums = 2165809683969955bca129f1960efa5111aaa703ac891df29b809f4ce5b30eaa
+	sha256sums = 5265ae79418a0c376d2f98cc52c5fc2ed34af802080e00c229754efe9f8e91d6
 	sha256sums = 6c6d7f19bcca181ee5c1c51c9f15e8d12d95e1feabcd676d1a41fc377f050d37
 
 pkgname = gog-heroes-of-might-and-magic-3-complete-edition
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d9ca42d854af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+pkg/
+src/
+*.pkg.tar.xz
+*.exe
+*.udd
diff --git a/PKGBUILD b/PKGBUILD
index 04f5214c6ad7..08ef483b65b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 pkgname=gog-heroes-of-might-and-magic-3-complete-edition
 pkgver=2.0.1.17
-pkgrel=5
+pkgrel=6
 _gamename=${pkgname#gog-}
-_gamename_=${_gamename//-/_}
+_gamename=${_gamename//-/_}
 _unpatchedver=2.0.0.16
 _gamehdpatchname="HoMM3%20HD%20Latest.exe"
 
@@ -12,19 +12,19 @@ url="https://www.gog.com/game/heroes_of_might_and_magic_3_complete_edition"
 license=("custom")
 groups=("games")
 
-source=("setup_homm3_complete_${_unpatchedver}.exe::gogdownloader://${_gamename_}/en1installer1"
-        "patch_${_gamename_%_edition}_${pkgver}.exe::gogdownloader://${_gamename_}/en1patch1"
+source=("setup_homm3_complete_${_unpatchedver}.exe::gogdownloader://${_gamename}/en1installer1"
+        "patch_${_gamename%_edition}_${pkgver}.exe::gogdownloader://${_gamename}/en1patch1"
 #        "http://h3hota.com/HD/HoMM3%20HD%20Latest.exe"
-        "${_gamename}"
-        "${_gamename}-map-editor"
-        "${_gamename}-campaign-editor"
+        "${pkgname}"
+        "${pkgname}-campaign-editor"
+        "${pkgname}-map-editor"
         "${pkgname}.install")
 sha256sums=('d90bed0fd7e5338045f5f9983fdc7390297025ac1accdbc2f9bbec217a066468'
             '9c6ca90dacc621f0bb333a3f5fb6df8b06af2afee571beea14782c989177ff5a'
 #            'SKIP'
-            '23dae6e2e75384498e67f8b0c681b5a10f28f950053582815e27ac25684a6d68'
-            'bc5f57dd8fe1c4cb9bc4f144eea686a61ccc19e5020e446796f8f4c79014c8be'
-            'f7b58168872ce04bfad2ef151632762d29735f3e165bc5c4cf887df68de62ed2'
+            'bb1cec5ef9de917ae69bb04d661d843986b038a277871557387cd66c7292604d'
+            '2165809683969955bca129f1960efa5111aaa703ac891df29b809f4ce5b30eaa'
+            '5265ae79418a0c376d2f98cc52c5fc2ed34af802080e00c229754efe9f8e91d6'
             '6c6d7f19bcca181ee5c1c51c9f15e8d12d95e1feabcd676d1a41fc377f050d37')
 depends=(wine)
 
@@ -44,7 +44,7 @@ build() {
   # Unfortunately, /verysilent doesn't prevent the installation is successful
   # messagebox from showing up and blocking. Manual intervention is required
   msg "Installing patches (don't launch game yet)"
-  wine "${srcdir}"/patch_${_gamename_%_edition}_${pkgver}.exe /verysilent
+  wine "${srcdir}"/patch_${_gamename%_edition}_${pkgver}.exe /verysilent
 #  msg "Installing HD patch"
 #  wine "${srcdir}/${_gamehdpatchname}" /verysilent
   msg "Extracting HKEY_LOCAL_MACHINE registry"
@@ -67,31 +67,31 @@ package() {
   rm -rf ${pkgdir}/opt/gog/${pkgname#gog-}/unins*
   rm -rf ${pkgdir}/opt/gog/${pkgname#gog-}/*.lnk
   # Give group write access to Data (to enable h3mmaped.exe)
-  chown :games ${pkgdir}/opt/gog/${_gamename#gog-}/Data/*
-  chmod g+w ${pkgdir}/opt/gog/${_gamename#gog-}/Data/*
+  chown :games ${pkgdir}/opt/gog/${pkgname#gog-}/Data/*
+  chmod g+w ${pkgdir}/opt/gog/${pkgname#gog-}/Data/*
   # Give group write access to HD3 launcher config
   #for conf in _HD3_Data/HD3_Launcher.ini _HD3_Data/Settings/sod.ini
   #do
-  #  touch ${pkgdir}/opt/gog/${_gamename#gog-}/${conf}
-  #  chown :games ${pkgdir}/opt/gog/${_gamename#gog-}/${conf}
-  #  chmod g+w ${pkgdir}/opt/gog/${_gamename#gog-}/${conf}
+  #  touch ${pkgdir}/opt/gog/${_pkgname#gog-}/${conf}
+  #  chown :games ${pkgdir}/opt/gog/${_pkgname#gog-}/${conf}
+  #  chmod g+w ${pkgdir}/opt/gog/${_pkgname#gog-}/${conf}
   #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/${_gamename}.desktop
-  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Heroes 3 Map Editor.desktop"                  ${pkgdir}/usr/share/applications/${_gamename}-map-editor.desktop
-  install -Dm644 "${srcdir}/tmp/local/applications/wine/Programs/GOG.com/Heroes of Might and Magic 3 Complete/Heroes 3 Campaign Editor.desktop"             ${pkgdir}/usr/share/applications/${_gamename}-campaign-editor.desktop
+  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/Heroes 3 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/Heroes 3 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/3679_gfw_high.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_gamename}.png
+    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/3679_gfw_high.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/0500_h3maped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_gamename}-map-editor.png
-    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/472F_h3ccmped.0.png ${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${_gamename}-campaign-editor.png
+    install -Dm644 ${srcdir}/tmp/local/icons/hicolor/${res}x${res}/apps/0500_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/472F_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 ${_gamename} ${_gamename}-map-editor ${_gamename}-campaign-editor
+  for file in ${pkgname} ${pkgname}-map-editor ${pkgname}-campaign-editor
   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
@@ -100,7 +100,7 @@ package() {
   
   # Install startup scripts
   install -m755 -d ${pkgdir}/usr/bin
-  for file in ${_gamename} ${_gamename}-map-editor ${_gamename}-campaign-editor
+  for file in ${pkgname} ${pkgname}-map-editor ${pkgname}-campaign-editor
   do
     install -m755 ${srcdir}/${file} ${pkgdir}/usr/bin
   done
diff --git a/heroes-of-might-and-magic-3-complete-edition b/gog-heroes-of-might-and-magic-3-complete-edition
index 2d13338f935b..885a7733f4fa 100755
--- a/heroes-of-might-and-magic-3-complete-edition
+++ b/gog-heroes-of-might-and-magic-3-complete-edition
@@ -1,7 +1,6 @@
 #!/bin/bash
 unset WINEPREFIX
-export WINEPREFIX="$HOME"/.gog-heroes-of-might-and-magic-3-complete-edition 
-export WINEDEBUG=-all
+export WINEPREFIX="$HOME"/.local/share/gog-heroes-of-might-and-magic-3-complete-edition 
 if [ ! -d "$WINEPREFIX" ]
 then
   mkdir -p "$WINEPREFIX"
diff --git a/heroes-of-might-and-magic-3-complete-edition-campaign-editor b/gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor
index d832aaee48bd..c5c8afa0b489 100755
--- a/heroes-of-might-and-magic-3-complete-edition-campaign-editor
+++ b/gog-heroes-of-might-and-magic-3-complete-edition-campaign-editor
@@ -1,7 +1,6 @@
 #!/bin/bash
 unset WINEPREFIX
-export WINEPREFIX="$HOME"/.gog-heroes-of-might-and-magic-3-complete-edition 
-export WINEDEBUG=-all
+export WINEPREFIX="$HOME"/.local/share/gog-heroes-of-might-and-magic-3-complete-edition 
 if [ ! -d "$WINEPREFIX" ]
 then
   mkdir -p "$WINEPREFIX"
diff --git a/heroes-of-might-and-magic-3-complete-edition-map-editor b/gog-heroes-of-might-and-magic-3-complete-edition-map-editor
index 4cc7f85127d7..b781428335f8 100755
--- a/heroes-of-might-and-magic-3-complete-edition-map-editor
+++ b/gog-heroes-of-might-and-magic-3-complete-edition-map-editor
@@ -1,7 +1,6 @@
 #!/bin/bash
 unset WINEPREFIX
-export WINEPREFIX="$HOME"/.gog-heroes-of-might-and-magic-3-complete-edition 
-export WINEDEBUG=-all
+export WINEPREFIX="$HOME"/.local/share/gog-heroes-of-might-and-magic-3-complete-edition 
 if [ ! -d "$WINEPREFIX" ]
 then
   mkdir -p "$WINEPREFIX"