updated to 11.0

fixed wine paths

3 files changed, 15 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 805200c5a868..4feb9ca39cd6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Aug 22 19:57:08 UTC 2017
 pkgbase = dngconverter
 	pkgdesc = Adobe DNG Converter
-	pkgver = 9.12
-	pkgrel = 3
+	pkgver = 11.0
+	pkgrel = 1
 	url = http://www.adobe.com/go/dng_converter_win/
 	arch = x86_64
 	license = custom: commercial
@@ -11,10 +9,10 @@ pkgbase = dngconverter
 	depends = wine
 	provides = dngconverter
 	conflicts = dngconverter
-	source = http://download.adobe.com/pub/adobe/dng/win/DNGConverter_9_12.exe
+	source = http://download.adobe.com/pub/adobe/dng/win/DNGConverter_11_0.exe
 	source = dngconverter
 	source = _dngconverter
-	sha1sums = 17468791b6118691f6cae60ca524c2f703485ff9
+	sha1sums = 68ec7f06544d9f893efd3ef19b9487266ad70722
 	sha1sums = SKIP
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 22725fad6f10..6861423ddc09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: rsteube <rsteube@users.noreply.github.com>
 pkgname=dngconverter
-pkgver=9.12
-pkgrel=3
+pkgver=11.0
+pkgrel=1
 pkgdesc='Adobe DNG Converter'
 arch=('x86_64')
 url='http://www.adobe.com/go/dng_converter_win/'
@@ -10,10 +10,10 @@ depends=('wine')
 makedepends=('wine')
 provides=("${pkgname}")
 conflicts=("${pkgname}")
-source=('http://download.adobe.com/pub/adobe/dng/win/DNGConverter_9_12.exe'
+source=("http://download.adobe.com/pub/adobe/dng/win/DNGConverter_${pkgver/./_}.exe"
         'dngconverter'
         '_dngconverter')
-sha1sums=('17468791b6118691f6cae60ca524c2f703485ff9'
+sha1sums=('68ec7f06544d9f893efd3ef19b9487266ad70722'
           'SKIP'
           'SKIP')
 
@@ -21,15 +21,15 @@ build() {
     install -m755 -d "$srcdir"/tmp "$srcdir"/tmp/env "$srcdir"/tmp/local
     export WINEPREFIX="$srcdir"/tmp/env
     export XDG_DATA_HOME="$srcdir"/tmp/local
-    wine "${srcdir}"/DNGConverter_9_12.exe /S
-    pkill -f 'C\:\\windows\\system32\\explorer\.exe C:\\Program Files \(x86\)\\Adobe'
+    wine "${srcdir}"/DNGConverter_${pkgver/./_}.exe /S
+    pkill -f 'C\:\\windows\\system32\\explorer\.exe C:\\Program Files\\Adobe'
 }
 
 package() {
     mkdir -p "${pkgdir}/usr/share/${pkgname}" "${pkgdir}/usr/bin" "${pkgdir}/usr/share/zsh/site-functions"
     cp _dngconverter "${pkgdir}/usr/share/zsh/site-functions/"
-    cp -ra "${srcdir}/tmp/env/drive_c/Program Files (x86)/Adobe/"* "${pkgdir}/usr/share/${pkgname}/"
-    cp -ra "${srcdir}/tmp/env/drive_c/users/Public/Application Data/Adobe/"* "${pkgdir}/usr/share/${pkgname}/"
+    cp -ra "${srcdir}/tmp/env/drive_c/Program Files/Adobe/"* "${pkgdir}/usr/share/${pkgname}/"
+    cp -ra "${srcdir}/tmp/env/drive_c/ProgramData/Adobe/"* "${pkgdir}/usr/share/${pkgname}/"
     find "${pkgdir}" -type d -exec chmod 755 "{}" \;
     find "${pkgdir}" -type f -exec chmod 644 "{}" \;
     cp dngconverter "${pkgdir}/usr/bin/"
diff --git a/dngconverter b/dngconverter
index 150b08cbb3dc..b35f0c7849a9 100755
--- a/dngconverter
+++ b/dngconverter
@@ -2,8 +2,8 @@
 export WINEPREFIX="${HOME}/.dngconverter/wine"
 
 if [ ! -d "${HOME}"/.dngconverter ] ; then
-  mkdir -p "${HOME}/.dngconverter/wine/drive_c/users/Public/Application Data/Adobe" || exit 1
-  ln -s /usr/share/dngconverter/CameraRaw "${HOME}/.dngconverter/wine/drive_c/users/Public/Application Data/Adobe/CameraRaw"
+  mkdir -p "${HOME}/.dngconverter/wine/drive_c/ProgramData/Adobe" || exit 1
+  ln -s /usr/share/dngconverter/CameraRaw "${HOME}/.dngconverter/wine/drive_c/ProgramData/Adobe/CameraRaw"
 fi
 
-wine "/usr/share/dngconverter/Adobe DNG Converter.exe" "$@"
+wine "/usr/share/dngconverter/Adobe DNG Converter/Adobe DNG Converter.exe" "$@"