Merge oil to oil-search

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9dd12ddd40bd..31054a10e3e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = oil
+pkgbase = oil-search
 	pkgdesc = Search-as-you-type cli frontend for the buku bookmarks manager using peco.
 	pkgver = 0.3.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/AndreiUlmeyda/oil
 	arch = any
 	license = GPL3
@@ -9,7 +9,7 @@ pkgbase = oil
 	depends = peco
 	depends = jq
 	depends = xsel
-	source = https://github.com/AndreiUlmeyda/oil/archive/refs/tags/0.3.2.tar.gz
+	source = oil-search-0.3.2.tar.gz::https://github.com/AndreiUlmeyda/oil/archive/refs/tags/0.3.2.tar.gz
 	sha256sums = 065f4bdcff8ef6642cb1b5fe9c8e95844be26e9a4935859672528b0f76d08adb
 
-pkgname = oil
+pkgname = oil-search
diff --git a/PKGBUILD b/PKGBUILD
index 30a6894a33fc..f1b1aee6d5b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,22 @@
-pkgname=oil
+# Maintainer: pk <patrik@nuit.cz>
+# Contributor: FabioLolix
+# Contributor: Johannes Frankenau
+
+pkgname=oil-search
 pkgver=0.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Search-as-you-type cli frontend for the buku bookmarks manager using peco. '
 arch=('any')
 url='https://github.com/AndreiUlmeyda/oil'
 license=('GPL3')
 depends=('buku' 'peco' 'jq' 'xsel')
-source=("https://github.com/AndreiUlmeyda/${pkgname}/archive/refs/tags/${pkgver}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AndreiUlmeyda/oil/archive/refs/tags/${pkgver}.tar.gz")
 sha256sums=('065f4bdcff8ef6642cb1b5fe9c8e95844be26e9a4935859672528b0f76d08adb')
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "oil-${pkgver}"
+  make PREFIX=/usr BINDIR=/usr/bin LIBDIR=/usr/lib/oil-search DESTDIR="${pkgdir}" install
+  mv "${pkgdir}/usr/bin/oil" "${pkgdir}/usr/bin/oil-search"
+  sed -i 's/LIBDIR=\/usr\/local\/lib\/oil/LIBDIR=\/usr\/lib\/oil-search/' "${pkgdir}/usr/bin/oil-search"
+  ln -s /usr/bin/oil-search "${pkgdir}/usr/bin/oils"
 }