fix everything

5 files changed, 52 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78ddaf2a7988..0c68aaf867f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,13 +9,16 @@ pkgbase = micro-cap
 	depends = wine
 	depends = wine-gecko
 	depends = wine-mono
+	depends = winetricks
+	depends = xorg-server-xvfb
+	noextract = micro-cap-12.zip
 	source = micro-cap-12.zip::http://www.spectrum-soft.com/download/mc12cd.zip
-	source = launcher
+	source = launcher.sh
 	source = setup.iss.tar
 	source = LICENSE
 	sha256sums = f4fda36ae96ab618c0487b2ff199b37bb8b12a26ecabc2ef11c6d36a5bac02a7
-	sha256sums = d4d5d2ce22691a8668ad5071c57f860e686b061142f8c9bd4cefe01df5f3c87f
-	sha256sums = d51262c700c2e860bbb8d6d9c0cacc424ba4a60edd299ce20b46367cc078fbbf
+	sha256sums = 826f2d2d409889d8ed20e8770de3f07d9d20c7a5f9a39950066295cee613828a
+	sha256sums = 92823edceadc722b5c9c8951de18e6ee7166fcb5d8ae625212f456aa8f1d1fb8
 	sha256sums = 350a5c1fe63617959e971db8f3f97a694b251fefee296c88fcbd939d3ec90f63
 
 pkgname = micro-cap
diff --git a/PKGBUILD b/PKGBUILD
index 5c54ae695bcf..c7f60ad2e4c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,37 +12,35 @@ depends=(
 wine
 wine-gecko
 wine-mono
+winetricks
+xorg-server-xvfb
 )
 
 # archived at https://web.archive.org/web/20201107223859/http://www.spectrum-soft.com/download/mc12cd.zip
-source=("${pkgname}-${pkgver}.zip::http://www.spectrum-soft.com/download/mc${pkgver}cd.zip" launcher setup.iss.tar LICENSE)
+source=("${pkgname}-${pkgver}.zip::http://www.spectrum-soft.com/download/mc${pkgver}cd.zip" launcher.sh setup.iss.tar LICENSE)
 sha256sums=('f4fda36ae96ab618c0487b2ff199b37bb8b12a26ecabc2ef11c6d36a5bac02a7'
-            'd4d5d2ce22691a8668ad5071c57f860e686b061142f8c9bd4cefe01df5f3c87f'
-            'd51262c700c2e860bbb8d6d9c0cacc424ba4a60edd299ce20b46367cc078fbbf'
+            '826f2d2d409889d8ed20e8770de3f07d9d20c7a5f9a39950066295cee613828a'
+            '92823edceadc722b5c9c8951de18e6ee7166fcb5d8ae625212f456aa8f1d1fb8'
             '350a5c1fe63617959e971db8f3f97a694b251fefee296c88fcbd939d3ec90f63')
 
-build(){
-  install -m755 -d tmp tmp/env tmp/local
-  export WINEPREFIX="${srcdir}/"tmp/env
-  export XDG_DATA_HOME="${srcdir}"/tmp/local
-  wineboot -u
+noextract=(${pkgname}-${pkgver}.zip)
 
-  cp setup.iss tmp/env/drive_c 
-  WINEDEBUG=-all wine "$srcdir"/setup.exe /SMS /s /f1"C:\setup.iss"
-}
+#build(){
+#  install -m755 -d tmp tmp/env tmp/local
+#  export WINEPREFIX="${srcdir}/"tmp/env
+#  export XDG_DATA_HOME="${srcdir}"/tmp/local
+#  wineboot -u
+#
+#  cp setup.iss tmp/env/drive_c 
+#  WINEDEBUG=-all wine "$srcdir"/setup.exe /SMS /s /f1"C:\setup.iss"
+#}
 
 package() {
-  cp launcher micro-cap
-  chmod +x micro-cap
+  cp launcher.sh micro-cap
   install -m755 -Dt "${pkgdir}"/usr/bin micro-cap
 
-  rm micro-cap
-  rm launcher
-  rm ${pkgname}-${pkgver}.zip
-
-  install -d -m755 "${pkgdir}"/usr/share/micro-cap/
-  cp -a "${srcdir}/"tmp/env "${pkgdir}"/usr/share/micro-cap
-  cp -a "${srcdir}/"tmp/local "${pkgdir}"/usr/share/micro-cap
+  install -m755 -Dt "${pkgdir}"/usr/share/micro-cap ${pkgname}-${pkgver}.zip
+  install -m644 -Dt "${pkgdir}"/usr/share/micro-cap setup.iss
 
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
 }
diff --git a/launcher b/launcher
deleted file mode 100644
index 5aae71eb04c7..000000000000
--- a/launcher
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-export XDG_DATA_HOME="$HOME"/.micro-cap/wine/local
-if [ ! -d "$HOME"/.micro-cap/wine/local ] ; then
-   mkdir -p "$HOME"/.micro-cap/wine
-   cp -a /usr/share/micro-cap/local "$HOME"/.micro-cap/wine
-fi
-export WINEPREFIX="$HOME"/.micro-cap/wine/env
-if [ ! -d "$HOME"/.micro-cap/wine/env ] ; then
-   mkdir -p "$HOME"/.micro-cap/wine
-   cp -a /usr/share/micro-cap/env "$HOME"/.micro-cap/wine
-fi
-WINEDEBUG=-all wine64 "C:\\MC12\\mc12_64.exe" "$@"
diff --git a/launcher.sh b/launcher.sh
new file mode 100755
index 000000000000..67fea026edd9
--- /dev/null
+++ b/launcher.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#export XDG_DATA_HOME="$HOME"/.micro-cap/wine/local
+#if [ ! -d "$HOME"/.micro-cap/wine/local ] ; then
+#   mkdir -p "$HOME"/.micro-cap/wine
+#   cp -a /usr/share/micro-cap/local "$HOME"/.micro-cap/wine
+#fi
+export WINEPREFIX="$HOME"/.micro-cap/wine/env
+export WINEARCH=win64
+if [ ! -d "$HOME"/.micro-cap/wine/env ] ; then
+   mkdir -p "$HOME"/.micro-cap/wine/env
+   wineboot -u
+   sleep 3
+   winetricks winxp
+   sleep 3
+   wineboot -e
+   sleep 3
+   mkdir -p "${WINEPREFIX}/drive_c/installer"
+   pushd "${WINEPREFIX}/drive_c/installer"
+   bsdtar -xvf /usr/share/micro-cap/micro-cap-12.zip
+   cp /usr/share/micro-cap/setup.iss .
+   popd
+   wine "C:\windows\command\start.exe" "C:\installer\setup.exe" /SMS /s /f1"C:\installer\setup.iss"
+   sleep 3
+   wineboot -e
+   sleep 3
+   rm -rf "${WINEPREFIX}/c_drive/installer"
+fi
+wine "C:\windows\command\start.exe" "C:\MC12\mc12_64.exe" "$@"
diff --git a/setup.iss.tar b/setup.iss.tar
index de4c29586050..a461e290e69c 100644
--- a/setup.iss.tar
+++ b/setup.iss.tar