pkgbuild rewrite

3 files changed, 33 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2659879e249b..6ab929a9d9f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
-# Generated by mksrcinfo v8
-# Sun Nov  5 10:24:10 UTC 2017
 pkgbase = oblogout-fork-git
-	pkgdesc = Openbox Logout Script Fork used by CrunchBang
+	pkgdesc = GTK/Cairo based logout box styled for Crunchbang
 	pkgver = 20130106
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/Cloudef/oblogout-fork
 	install = oblogout.install
 	arch = any
 	license = GPL2
 	makedepends = git
 	depends = pygtk
+	depends = python
 	depends = python2-pillow
 	depends = python2-distutils-extra
 	depends = python2-dbus
@@ -17,10 +16,12 @@ pkgbase = oblogout-fork-git
 	conflicts = openboxlogout-gnome
 	conflicts = oblogout
 	backup = etc/oblogout.conf
+	source = oblogout-fork::git+https://github.com/Cloudef/oblogout-fork
 	source = oblogout.conf
 	source = switch-user.patch
-	md5sums = 1e43b3a6ffeaefa0f68152a473259676
-	md5sums = 86a7a64ae86c0d733f69d37da05eb357
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = oblogout-fork-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7fb439ebfdcc..b3e568bfbab5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,38 @@
-# Maintainer: dustball
+# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
+# Contributor: dustball
 
 pkgname=oblogout-fork-git
 pkgver=20130106
-pkgrel=3
-pkgdesc="Openbox Logout Script Fork used by CrunchBang"
+pkgrel=4
+pkgdesc="GTK/Cairo based logout box styled for Crunchbang"
 arch=('any')
-url="https://github.com/Cloudef/oblogout-fork"
-depends=('pygtk' 'python2-pillow' 'python2-distutils-extra' 'python2-dbus')
+url='https://github.com/Cloudef/oblogout-fork'
+license=('GPL2')
+depends=('pygtk'
+         'python'
+         'python2-pillow'
+         'python2-distutils-extra'
+         'python2-dbus')
 optdepends=('upower')
 makedepends=('git')
-license=('GPL2')
 backup=(etc/oblogout.conf)  
 conflicts=('openboxlogout-gnome' 'oblogout')
 install=oblogout.install
-source=(oblogout.conf
-	switch-user.patch)
-md5sums=('1e43b3a6ffeaefa0f68152a473259676'
-         '86a7a64ae86c0d733f69d37da05eb357')
-
-_gitroot="git://github.com/Cloudef/oblogout-fork.git"
-_gitname="oblogout-fork"
+source=("${pkgname%-git}::git+${url}"
+        'oblogout.conf'
+        'switch-user.patch')
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gitroot $_gitname --dept=1
-  fi
-
-  cd "$srcdir/$_gitname"
-
+  cd "${pkgname%-git}"
   patch -p1 < "$srcdir/switch-user.patch"
 }
 
 package() {
-  cd "$srcdir/$_gitname"
-  python2 setup.py install --root="$pkgdir/"
-  install -m644 "$srcdir/oblogout.conf" "$pkgdir/etc/"
+  cd "${pkgname%-git}"
+  python2 setup.py install --root="${pkgdir}/"
+  install -m644 "${srcdir}/oblogout.conf" "${pkgdir}/etc/"
 }
-
-# vim:set ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et:
\ No newline at end of file
diff --git a/oblogout.install b/oblogout.install
index 6aaed9150454..5e72d593f5ca 100644
--- a/oblogout.install
+++ b/oblogout.install
@@ -1,14 +1,12 @@
 post_install () {
-
-echo ' IMPORTANT'
-echo 'Make sure that dbus is running'
-echo 'Customise the config (/etc/oblogout.conf) as required'
+  echo ' IMPORTANT'
+  echo 'Make sure that dbus is running'
+  echo 'Customise the config (/etc/oblogout.conf) as required'
 }
 
 post_upgrade() {
 	post_install $1
 }
-
 op=$1
 shift
-$op $*
+$op $*
\ No newline at end of file