many improvements, thanks to Archlinux-AUR IRC channel users

3 files changed, 21 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db01818a1115..66484047f1e4 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = betterlockscreen-git
 	pkgdesc = A simple lock script for i3lock-color
 	pkgver = v4.0.4.r0.ge6c5530
-	pkgrel = 1
-	url = https://github.com/pavanjadhaw/betterlockscreen
-	install = betterlockscreen.install
+	pkgrel = 2
+	url = https://github.com/betterlockscreen/betterlockscreen
 	arch = any
 	license = MIT
+	makedepends = git
 	depends = i3lock-color>=2.13.c.3-1
 	depends = imagemagick
 	depends = xorg-xrandr
 	depends = xorg-xdpyinfo
 	depends = bc
 	optdepends = feh: Allows setting wallpaper
+	provides = betterlockscreen
 	conflicts = betterlockscreen
-	source = betterlockscreen::git+https://github.com/pavanjadhaw/betterlockscreen.git#branch=main
+	source = betterlockscreen::git+https://github.com/betterlockscreen/betterlockscreen.git#branch=main
 	md5sums = SKIP
 
 pkgname = betterlockscreen-git
diff --git a/PKGBUILD b/PKGBUILD
index 44df55448b28..61e5caa6d2a3 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,20 @@
 
 _pkgname=betterlockscreen
 pkgname=${_pkgname}-git
+provides=("betterlockscreen")
+conflicts=("betterlockscreen")
 pkgver=v4.0.4.r0.ge6c5530
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple lock script for i3lock-color"
 arch=('any')
-url="https://github.com/pavanjadhaw/${_pkgname}"
+url="https://github.com/betterlockscreen/betterlockscreen"
 _git_branch="main"
 license=('MIT')
+makedepends=('git')
 depends=('i3lock-color>=2.13.c.3-1' 'imagemagick' 'xorg-xrandr' 'xorg-xdpyinfo' 'bc')
 optdepends=('feh: Allows setting wallpaper')
-conflicts=("betterlockscreen")
 source=("${_pkgname}::git+${url}.git#branch=$_git_branch")
 md5sums=('SKIP')
-install=${_pkgname}.install
 
 pkgver() {
 	cd "$_pkgname"
@@ -24,13 +25,18 @@ pkgver() {
 }
 
 package() {
+	# install executable
 	_srcdir="$srcdir/$_pkgname"
 	install -Dm 755 "$_srcdir/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-	if [[ $(pidof systemd) ]]; then
-		_serviceloc="$pkgdir/usr/lib/systemd/system"
-		_servicename="$_pkgname@.service"
-        sed -i 's,usr/local,usr,' "$_srcdir/system/$_servicename"
-		install -Dm 644 "$_srcdir/system/$_servicename" "$_serviceloc/$_servicename"
-	fi
+
+	# install systemd user service
+	_serviceloc="$pkgdir/usr/lib/systemd/system"
+	_servicename="$_pkgname@.service"
+    sed -i 's,usr/local,usr,' "$_srcdir/system/$_servicename"
+#    sed -i '/^User/d' "$_srcdir/system/$_servicename"
+	install -Dm 644 "$_srcdir/system/$_servicename" "$_serviceloc/$_servicename"
+
+	# add config example and LICENCE files
 	install -Dm 644 "$_srcdir/examples/${_pkgname}rc" "$pkgdir/usr/share/doc/$_pkgname/examples/${_pkgname}rc"
+	install -Dm 644 "$_srcdir/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname"
 }
diff --git a/betterlockscreen.install b/betterlockscreen.install
deleted file mode 100644
index 6e40082fd146..000000000000
--- a/betterlockscreen.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	if [[ $(pidof systemd) ]]; then
-        echo "Systemd service installed, to enable type:"
-		echo 'sudo systemctl enable betterlockscreen@$USER'
-	fi
-}
-
-post_upgrade() {
-	post_install
-}