Fix some changed paths

3 files changed, 14 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ada1d214b3a1..f6cd05c05254 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 # Generated by mksrcinfo v8
-# Thu Jan 10 10:38:31 UTC 2019
+# Tue Feb  4 20:20:01 UTC 2020
 pkgbase = openecardapp
-	pkgdesc = Open eCard-App (opencard) is an open source alternative of the AusweisApp
-	pkgver = 1.3.0
-	pkgrel = 1
+	pkgdesc = An open source alternative of the AusweisApp
+	pkgver = 1.4.1
+	pkgrel = 4
 	url = https://www.openecard.org
 	install = openecardapp.install
 	arch = any
 	license = GPL3
 	depends = java-runtime
 	depends = pcsclite
-	source = https://github.com/ecsec/open-ecard/releases/download/1.3.0/Open-eCard-App-1.3.0.deb
-	md5sums = 268075f1b3a9f2ae1b8166f6942d418a
+	source = https://github.com/ecsec/open-ecard/releases/download/1.4.1/open-ecard-app_1.4.1_amd64.deb
+	sha256sums = f83833a1242bb1b46e433aacbf3124da4019be74a781cb9c12187dfe77697664
 
 pkgname = openecardapp
 
diff --git a/PKGBUILD b/PKGBUILD
index 562e21e901de..c5dd6d6fb897 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=openecardapp
 pkgver=1.4.1
-pkgrel=1
+pkgrel=4
 pkgdesc="An open source alternative of the AusweisApp"
 arch=('any')
 url="https://www.openecard.org"
@@ -18,8 +18,8 @@ prepare() {
 	cd "$srcdir"
 	echo "#!/bin/sh" > openecardapp
 	echo "" >> openecardapp
-	echo "cd /usr/share/java/openecardapp/" >> openecardapp
-	echo "exec /opt/Open-eCard-App/Open-eCard-App \$@" >> openecardapp
+	echo "cd /opt/open-ecard-app/" >> openecardapp
+	echo "/opt/open-ecard-app/bin/open-ecard-app \$@" >> openecardapp
 }
 
 package() {
diff --git a/openecardapp.install b/openecardapp.install
index 4f134b9e3440..d3680106d126 100644
--- a/openecardapp.install
+++ b/openecardapp.install
@@ -1,21 +1,22 @@
 ## arg 1:  the new package version
 post_install() {
-	xdg-desktop-menu install --novendor /opt/Open-eCard-App/Open-eCard-App.desktop
+	xdg-desktop-menu install --novendor /opt/open-ecard-app/lib/open-ecard-app-open-ecard-app.desktop
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 pre_upgrade() {
-	xdg-desktop-menu uninstall --novendor --noupdate /opt/Open-eCard-App/Open-eCard-App.desktop
+	test -f /opt/Open-eCard-App/Open-eCard-App.desktop && xdg-desktop-menu uninstall --novendor --noupdate /opt/Open-eCard-App/Open-eCard-App.desktop || true
+	test -f /opt/Open-eCard-App/Open-eCard-App.desktop && xdg-desktop-menu uninstall --novendor --noupdate /opt/Open-eCard-App/Open-eCard-App.desktop || true
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-	xdg-desktop-menu install --novendor /opt/Open-eCard-App/Open-eCard-App.desktop
+	xdg-desktop-menu install --novendor /opt/open-ecard-app/lib/open-ecard-app-open-ecard-app.desktop
 }
 
 ## arg 1:  the old package version
 pre_remove() {
-	xdg-desktop-menu uninstall --novendor /opt/Open-eCard-App/Open-eCard-App.desktop
+	xdg-desktop-menu uninstall --novendor /opt/open-ecard-app/lib/open-ecard-app-open-ecard-app.desktop
 }