summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Haylett2019-07-07 23:33:56 +0100
committerJonathan Haylett2019-07-07 23:33:56 +0100
commitc187dbb4edd2ed2da8c97caf03fb35c077003452 (patch)
tree4094bbb6991a5af2066f7e112240854ec002845a
parent06fb7998112f8c0a1d492e54f55c8be51e692a80 (diff)
downloadaur-c187dbb4edd2ed2da8c97caf03fb35c077003452.tar.gz
Revert "Rewrite package function"
This reverts commit 06fb7998112f8c0a1d492e54f55c8be51e692a80.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD14
2 files changed, 13 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea6a05c10536..cb7613f079c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
pkgbase = i3-resurrect-git
pkgdesc = A simple but flexible solution to saving and restoring i3 workspace layouts
pkgver = 1.0.2
- pkgrel = 3
+ pkgrel = 2
url = http://github.com/JonnyHaystack/i3-resurrect
arch = any
license = GPL
depends = python
- depends = python-setuptools
depends = i3-wm
depends = perl-anyevent-i3
- depends = wmctrl
+ depends = python-psutil
+ depends = i3ipc-python-git
+ depends = wmctrl-python3-git
source = git+https://github.com/JonnyHaystack/i3-resurrect
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fc38e9330900..02bd9a4b53f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Jonathan Haylett <jonathan@haylett.dev>
_pkgbasename=i3-resurrect
pkgname=$_pkgbasename-git
-pkgrel=3
+pkgrel=2
pkgver=1.0.2
pkgdesc="A simple but flexible solution to saving and restoring i3 workspace layouts"
arch=('any')
url="http://github.com/JonnyHaystack/i3-resurrect"
license=('GPL')
-depends=('python' 'python-setuptools' 'i3-wm' 'perl-anyevent-i3' 'wmctrl')
+depends=('python' 'i3-wm' 'perl-anyevent-i3' 'python-psutil' 'i3ipc-python-git' 'wmctrl-python3-git')
source=(git+https://github.com/JonnyHaystack/i3-resurrect)
md5sums=('SKIP')
@@ -19,12 +19,16 @@ pkgver() {
build() {
cd "$srcdir/$_pkgbasename"
- python setup.py build
+ python setup.py bdist
}
package() {
- cd "${srcdir}/${_pkgbasename}"
+ _pkg=$(ls "$srcdir/$_pkgbasename/dist/")
+ tar -xC "$pkgdir/" -f "$srcdir/$_pkgbasename/dist/$_pkg"
- python setup.py install --root="${pkgdir}" --optimize=1
+ mkdir -p "$pkgdir/usr/bin"
+
+ _python=$(ls "$pkgdir/usr/lib/")
+ chmod +x "$pkgdir/usr/lib/$_python/site-packages/i3_resurrect.py"
}