Fix PKGBUILD - untested

* remove `sudo` usage
* port all Makefile commands to the PKGBUILD

3 files changed, 24 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfe597b59d9e..8bfe3fe5ed08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,14 @@
 pkgbase = bsp-layout
 	pkgdesc = Dynamic layout management for bspwm with tall, wide, even, tiled, monocle
 	pkgver = 0.0.10
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/phenax/bsp-layout
-	install = .install
 	arch = any
 	license = MIT
-	makedepends = bash
-	makedepends = git
 	depends = bash
 	depends = bc
-	provides = bsp-layout
-	conflicts = bsp-layout
-	source = https://github.com/phenax/bsp-layout/archive/0.0.10.tar.gz
-	md5sums = SKIP
+	depends = bspwm
+	source = bsp-layout-0.0.10.tar.gz::https://github.com/phenax/bsp-layout/archive/0.0.10.tar.gz
+	sha256sums = ec71dd3438ff84ab3dd6d72673500a33158937112e9fcf87c64b02313bc1c1c8
 
 pkgname = bsp-layout
diff --git a/.install b/.install
deleted file mode 100644
index 60663f4154bb..000000000000
--- a/.install
+++ /dev/null
@@ -1,42 +0,0 @@
-# This is a default template for a post-install scriptlet.
-# Uncomment only required functions and remove any functions
-# you don't need (and this header).
-
-## arg 1:  the new package version
-#pre_install() {
-	# do something here
-#}
-
-## arg 1:  the new package version
-#post_install() {
-	# do something here
-#}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-#pre_upgrade() {
-	# do something here
-#}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-#post_upgrade() {
-	# do something here
-#}
-
-## arg 1:  the old package version
-#pre_remove() {
-	# do something here
-#}
-
-## arg 1:  the old package version
-post_remove() {
-  local INSTALL_DIR=/usr/lib/bsp-layout;
-  local BINARY=/usr/local/bin/bsp-layout;
-  local MAN_PAGE=/usr/local/man/man1/bsp-layout.1;
-
-  # Clean up
-  rm -rf $INSTALL_DIR;
-  rm -rf $BINARY;
-  rm -rf $MAN_PAGE;
-}
diff --git a/PKGBUILD b/PKGBUILD
index 58a337f6585d..f36b64ca59a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,30 @@
-# Maintainer: phanium <$(echo bnhoc2R1QHFxLmNvbQo= | base64 -d)>
-# Maintainer: Akshay Nair <phenax5@gmail.com>
+# Contributor: phanium <$(echo bnhoc2R1QHFxLmNvbQo= | base64 -d)>
+# Contributor: Akshay Nair <phenax5@gmail.com>
 
 pkgname=bsp-layout
 pkgver=0.0.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Dynamic layout management for bspwm with tall, wide, even, tiled, monocle"
 arch=('any')
 url="https://github.com/phenax/bsp-layout"
 license=('MIT')
-depends=('bash' 'bc')
-makedepends=('bash' 'git')
-checkdepends=()
-optdepends=()
-provides=("$pkgname")
-conflicts=("$pkgname")
-install=".install"
-source=("$url/archive/$pkgver.tar.gz")
-md5sums=('SKIP')
+depends=('bash' 'bc' 'bspwm')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+sha256sums=('ec71dd3438ff84ab3dd6d72673500a33158937112e9fcf87c64b02313bc1c1c8')
 
-package() {
-  cd "$pkgname-$pkgver";
-  sudo ./install.sh local;
-  #make PREFIX=/usr DESTDIR="$pkgdir" install
+prepare() {
+  cd "$pkgname-$pkgver"
+  sed -i 's#{{SOURCE_PATH}}#/usr/lib/bsp-layout#' src/layout.sh
+  sed -i 's#{{VERSION}}#'$pkgver'#' src/layout.sh bsp-layout.1
 }
 
+package() {
+  cd "$pkgname-$pkgver"
+  install -Dm755 -t "$pkgdir/usr/lib/$pkgname/" src/layout.sh
+  install -Dm755 -t "$pkgdir/usr/lib/$pkgname/utils/" src/utils/*.sh
+  install -Dm755 -t "$pkgdir/usr/lib/$pkgname/layouts/" src/layouts/*.sh
+  install -Dm755 -t "$pkgdir/usr/share/man/man1" bsp-layout.1
+  install -dm755 "$pkgdir/usr/bin"
+  ln -s "/usr/lib/$pkgname/layout.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}