add: dotnet40 install, and some more enhancements

4 files changed, 29 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c719a2d49865..c159de2e692f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,7 @@ pkgbase = keepass-wine
 	arch = any
 	license = GPL
 	makedepends = icoutils
-	makedepends = mono
+	makedepends = winetricks
 	depends = wine
 	depends = desktop-file-utils
 	depends = xdg-utils
@@ -16,21 +16,20 @@ pkgbase = keepass-wine
 	optdepends = xdotool: if you want to use auto-type
 	optdepends = xsel: clipboard operations
 	provides = keepass
-	source = http://downloads.sourceforge.net/keepass/KeePass-2.34-Source.zip
-	source = http://keepass.info/integrity/v2/KeePass-2.34-Source.zip.asc
-	source = http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe
+	conflicts = keepass
+	source = http://downloads.sourceforge.net/keepass/KeePass-2.34.zip
 	source = keepass
 	source = keepass.1
 	source = keepass.desktop
 	source = keepass.xml
-	validpgpkeys = C2DAB36D996021CF18B8D4F4158DFACCBE64B2C1
-	sha256sums = e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa
-	sha256sums = SKIP
-	sha256sums = 46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71
-	sha256sums = a44456b7da55432867bcdfdda051a5b25601616a943fdc1dd1be30bd562f7ffb
+	source = KeePass.ico
+	validpgpkeys = D95044283EE948D911E8B606A4F762DC58C6F98E
+	sha256sums = 52dd5a8526cc935b0e240d5ab6402b0b4a3f5f09ad1a6919875878d7f36c697f
+	sha256sums = 666911c06fbe3a8670b5cd841ced50e6c8a7724938280c0ce7ac92262d9406b6
 	sha256sums = a5fff678466443c0c8256c4771128c86103da47b6a2c49351d9941191b65dd6f
 	sha256sums = 1d5420e8babce5f4bbb3c68bdffe3bc0d3c3be25ad689138cd02fa14edd89140
 	sha256sums = 3d017c17a8788166c644e2460ba3596fd503f300342561921201fe5f69e5d194
+	sha256sums = d08ebdd9b0a99f6dc4f62bb20d7bb9ce6ab3139fcb31c8830954e16ebbd3d058
 
 pkgname = keepass-wine
 
diff --git a/PKGBUILD b/PKGBUILD
index 8214f8250c28..1c05b12142dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,12 +11,11 @@ license=('GPL')
 depends=('wine' 'desktop-file-utils' 'xdg-utils' 'shared-mime-info' 'gtk-update-icon-cache')
 provides=('keepass')
 conflicts=('keepass')
-makedepends=('icoutils')
+makedepends=('icoutils' 'winetricks')
 optdepends=('xdotool: if you want to use auto-type'
             'xsel: clipboard operations')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/keepass/KeePass-$pkgver.zip"
-        "http://download.lenovo.com/ibmdl/pub/pc/pccbbs/thinkvantage_en/dotnetfx.exe"
         'keepass'
         'keepass.1'
         'keepass.desktop'
@@ -24,7 +23,6 @@ source=("http://downloads.sourceforge.net/keepass/KeePass-$pkgver.zip"
         'KeePass.ico')
 
 sha256sums=('52dd5a8526cc935b0e240d5ab6402b0b4a3f5f09ad1a6919875878d7f36c697f'
-            '46693d9b74d12454d117cc61ff2e9481cabb100b4d74eb5367d3cf88b89a0e71'
             '666911c06fbe3a8670b5cd841ced50e6c8a7724938280c0ce7ac92262d9406b6'
             'a5fff678466443c0c8256c4771128c86103da47b6a2c49351d9941191b65dd6f'
             '1d5420e8babce5f4bbb3c68bdffe3bc0d3c3be25ad689138cd02fa14edd89140'
@@ -61,4 +59,22 @@ package() {
 
   # Needed for postinst with xdg-utils
   install -Dm644 keepass.xml "$pkgdir"/usr/share/mime/packages/keepass.xml
+
+  # Install dotnet
+  export WINEPREFIX="$pkgdir"/usr/share/keepass/wine
+  export WINEARCH=win32
+  export WINEDLLOVERRIDES="mscoree,mshtml="
+  winetricks -q dotnet20 dotnet40
+
+  # Set PathExt
+  keyname="HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
+  valuename="PATHEXT"
+  value="$(wine reg query "$keyname" -v "$valuename" | sed 's|\r||g' | awk  '$1 == "PATHEXT" {print $3 ";."}')"
+  wine reg add "$keyname" /f /v "$valuename" /t REG_SZ /d "$value"
+
+  # Set Path
+  keyname="HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
+  valuename="PATH"
+  value="$(wine reg query "$keyname" -v "$valuename" | sed 's|\r||g' | awk  '$1 == "PATH" {print $3}')$(echo $(for i in $(echo $PATH | sed 's|:|\n|g') ; do echo -n \;$(winepath -w $i) ; done 2>/dev/null))"
+  wine reg add "$keyname" /f /v "$valuename" /t REG_SZ /d "$value"
 }
diff --git a/keepass b/keepass
index 8e36ae97a211..ecbc5387c32a 100755
--- a/keepass
+++ b/keepass
@@ -1,28 +1,12 @@
 #!/bin/sh
-
 export WINEPREFIX="$HOME/.keepass/wine"
 export WINEARCH=win32
+export WINEDLLOVERRIDES="mscoree,mshtml="
 export WINEDEBUG=-all
 
-function setpath(){
-    # PathExt
-    keyname="HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
-    valuename="PATHEXT"
-    value="$(wine reg query "$keyname" -v "$valuename" | sed 's|\r||g' | awk  '$1 == "PATHEXT" {print $3 ";."}')"
-    wine reg add "$keyname" /f /v "$valuename" /t REG_SZ /d "$value"
-    # Path
-    keyname="HKLM\System\CurrentControlSet\Control\Session Manager\Environment"
-    valuename="PATH"
-    value="$(wine reg query "$keyname" -v "$valuename" | sed 's|\r||g' | awk  '$1 == "PATH" {print $3}')$(echo $(for i in $(echo $PATH | sed 's|:|\n|g') ; do echo -n \;$(winepath -w $i) ; done 2>/dev/null))"
-    wine reg add "$keyname" /f /v "$valuename" /t REG_SZ /d "$value"
-}
-
 # First Run
 if [ ! -d "$WINEPREFIX" ] ; then
-    mkdir -p `dirname $WINEPREFIX`
-    # Install dotnetfx
-    wine "/usr/share/keepass/dotnetfx.exe" /c:"install.exe /q"
-    setpath
+    cp -r "/usr/share/keepass/wine" "$WINEPREFIX"
 fi
 
 # Start Keepass
diff --git a/keepass-wine.install b/keepass-wine.install
index 8a562e60f49d..47d8e393ef1f 100644
--- a/keepass-wine.install
+++ b/keepass-wine.install
@@ -5,7 +5,6 @@ post_remove() {
 
 post_install() {
   post_remove
-  mono --aot -O=all usr/share/keepass/KeePass.exe &> /dev/null
   mkdir -p usr/share/keepass/Plugins
 }