Modify needed files path without using a patch.

3 files changed, 17 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acee94a53c7c..ef9a6d696d23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Jan 31 20:19:55 UTC 2017
+# Tue Apr 18 14:46:08 UTC 2017
 pkgbase = manager-accounting
 	pkgdesc = Manager is free accounting software for small business
-	pkgver = 17.1.16
+	pkgver = 17.4.43
 	pkgrel = 1
 	url = http://www.manager.io/
 	install = manager-accounting.install
@@ -16,11 +16,9 @@ pkgbase = manager-accounting
 	depends = webkit-sharp
 	options = !makeflags
 	source = LICENSE
-	source = fix-path.patch
 	source = https://mngr.s3.amazonaws.com/manager-accounting.zip
 	source = https://raw.githubusercontent.com/ericsink/SQLitePCL.raw/master/sqlite3/sqlite3.c
 	sha256sums = bd144763506372341487683b0f28ad627e7e8923ea8ef8569541b55f4b987061
-	sha256sums = 81e73bbae1a386dc76bd1f8b018868864c802cb242667d18b9d6f005518859f7
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d5453e6932e..0c1bd25d0d75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: François M. <francois5537 @ gmail.com>
 
 pkgname=manager-accounting
-pkgver=17.1.16
+pkgver=17.4.43
 pkgrel=1
 pkgdesc='Manager is free accounting software for small business'
 arch=('i686' 'x86_64')
@@ -14,13 +14,11 @@ install=manager-accounting.install
 options=('!makeflags')
 source=(
   "LICENSE"
-  "fix-path.patch"
   "https://mngr.s3.amazonaws.com/manager-accounting.zip"
   "https://raw.githubusercontent.com/ericsink/SQLitePCL.raw/master/sqlite3/sqlite3.c"
 )
 sha256sums=(
   'bd144763506372341487683b0f28ad627e7e8923ea8ef8569541b55f4b987061'
-  '81e73bbae1a386dc76bd1f8b018868864c802cb242667d18b9d6f005518859f7'
   'SKIP'
   'SKIP'
 )
@@ -46,13 +44,24 @@ prepare() {
 
   # Extract, patch
   tar --strip-components=1 -zxvf "${pkgname}_${_pkgver}.tar.gz"
-  patch -p1 -i fix-path.patch
+
+  sed -i \
+    's|/usr/bin/cli|/usr/bin/mono|g' \
+    opt/manager-accounting/manager-accounting
+
+  sed -i \
+    's|/opt/|/usr/lib/|g' \
+    opt/manager-accounting/manager-accounting
+
+  sed -i \
+    's|/opt/|/usr/lib/|g' \
+    usr/share/applications/manager-accounting.desktop
 
   # Extract libe_sqlite.so by executing ManagerServer.exe
   # on port 1 to fail on purpose.
   # ref: https://forum.manager.io/t/manager-does-not-start-after-recent-update-on-ubuntu/7950/19
-  cd "$srcdir/opt/manager-accounting"
-  mono ManagerServer.exe -port 1 2>&1 > /dev/null
+  #cd "$srcdir/opt/manager-accounting"
+  #mono ManagerServer.exe -port 1 2>&1 > /dev/null
 }
 
 build() {
diff --git a/fix-path.patch b/fix-path.patch
deleted file mode 100644
index bec1eda79ccd..000000000000
--- a/fix-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/opt/manager-accounting/manager-accounting
-+++ b/opt/manager-accounting/manager-accounting
-@@ -1,3 +1,3 @@
- #!/bin/sh
- 
--exec /usr/bin/cli /opt/manager-accounting/ManagerDesktop.exe "$@"
-+exec /usr/bin/mono /usr/lib/manager-accounting/ManagerDesktop.exe "$@"
-
---- a/usr/share/applications/manager-accounting.desktop
-+++ b/usr/share/applications/manager-accounting.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Name=Manager Accounting
- Comment=Accounting software
--Exec=/opt/manager-accounting/manager-accounting
--Path=/opt/manager-accounting
-+Exec=/usr/lib/manager-accounting/manager-accounting
-+Path=/usr/lib/manager-accounting
- Terminal=false
- Icon=manager-accounting
- Type=Application