update pkgver(), incorporate .install

3 files changed, 9 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 790dfb5fd151..6f7312749e05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = linux-enable-ir-emitter-git
 	pkgdesc = Enables infrared cameras that are not directly enabled out-of-the box
-	pkgver = r3.3ecdb3b
+	pkgver = 3.1.1.r0.g2a3d6ff
 	pkgrel = 1
 	url = https://github.com/EmixamPP/linux-enable-ir-emitter
-	install = linux-enable-ir-emitter.install
 	arch = x86_64
 	license = MIT
 	makedepends = git
diff --git a/PKGBUILD b/PKGBUILD
index b669cfaffbe6..40ed749eb70c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Nikolay Bryskin <nbryskin@gmail.com>
 
 pkgname=linux-enable-ir-emitter-git
-pkgver=r3.3ecdb3b
+pkgver=3.1.1.r0.g2a3d6ff
 pkgrel=1
 pkgdesc="Enables infrared cameras that are not directly enabled out-of-the box"
 url="https://github.com/EmixamPP/linux-enable-ir-emitter"
@@ -17,13 +17,12 @@ conflicts=(linux-enable-ir-emitter chicony-ir-toggle)
 makedepends=(git)
 depends=(python python-opencv python-yaml)
 
-install=linux-enable-ir-emitter.install
-
 source=("git+https://github.com/EmixamPP/linux-enable-ir-emitter")
 sha256sums=('SKIP')
 
 pkgver() {
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "${srcdir}/${pkgname/-git}"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
@@ -45,4 +44,9 @@ package() {
 
     # boot service
     install -Dm 644 sources/linux-enable-ir-emitter.service -t ${pkgdir}/usr/lib/systemd/system/
+
+    install -d "${pkgdir}"/usr/bin/
+    chmod +x "${pkgdir}"/usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py
+    ln -fs /usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py \
+    "${pkgdir}"/usr/bin/linux-enable-ir-emitter
 }
diff --git a/linux-enable-ir-emitter.install b/linux-enable-ir-emitter.install
deleted file mode 100644
index 498578413a7d..000000000000
--- a/linux-enable-ir-emitter.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  # executable
-  chmod +x /usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py
-  ln -fs /usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py \
-    /usr/bin/linux-enable-ir-emitter
-}
-
-post_upgrade() {
-  # executable
-  chmod +x /usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py
-  ln -fs /usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py \
-    /usr/bin/linux-enable-ir-emitter
-}
-
-post_remove() {
-  # delete file added after installation
-  rm -f /etc/linux-enable-ir-emitter.yaml
-  rm -f /usr/bin/linux-enable-ir-emitter
-}