polish

7 files changed, 25 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0220186a3a1d..0e7f1b9a6948 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = oblogout-blurlock
 	pkgdesc = Systemd/OpenRC-compatible logout script for Openbox, Fluxbox and others including OutMok icons and blurlock. Originally written for Manjaro-Fluxbox
-	pkgver = 20150926
-	pkgrel = 2
+	pkgver = 20150927
+	pkgrel = 1
 	url = https://forum.manjaro.org/index.php?topic=25894.0
 	install = oblogout-blurlock.install
 	arch = any
@@ -13,7 +13,6 @@ pkgbase = oblogout-blurlock
 	depends = python2-pillow
 	depends = python2-distutils-extra
 	depends = python2-dbus
-	optdepends = upower
 	optdepends = lightdm: for switch-user function
 	conflicts = fluxlogout
 	conflicts = oblogout
@@ -27,11 +26,11 @@ pkgbase = oblogout-blurlock
 	source = http://www.oberon.at/oberon/src/OutMok.tar.xz
 	source = switch-user.patch
 	md5sums = f10cb96555b02245d944b381abb14221
-	md5sums = 67eff1ab5310456841c887ad6b06bf50
-	md5sums = 12a8c357f261db5752c7841ed7b4e678
+	md5sums = eef31ce5c7a9f002ef407394cf6fd20b
+	md5sums = 026c5552b167b39b40883bd39128cb35
 	md5sums = 0e9d42c6c83022515d3b14275f630f87
 	md5sums = a30813dafbe1b9d650db2f237ac1d89d
-	md5sums = 86a7a64ae86c0d733f69d37da05eb357
+	md5sums = 4bb8046c6d6a9709796afd814feec8f1
 
 pkgname = oblogout-blurlock
 
diff --git a/PKGBUILD b/PKGBUILD
index 7575124b9961..f3db08fa3f88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=oblogout-blurlock
 _gitname="oblogout-fork"
-pkgver=20150926
-pkgrel=2
+pkgver=20150927
+pkgrel=1
 pkgdesc="Systemd/OpenRC-compatible logout script for Openbox, Fluxbox and others including OutMok icons and blurlock. Originally written for Manjaro-Fluxbox"
 arch=('any')
 url="https://forum.manjaro.org/index.php?topic=25894.0"
@@ -17,8 +17,7 @@ depends=('i3lock'
 	'python2-pillow'
 	'python2-distutils-extra'
 	'python2-dbus')
-optdepends=('upower'
-	'lightdm: for switch-user function')
+optdepends=('lightdm: for switch-user function')
 makedepends=('git')
 install=$pkgname.install 
 conflicts=('fluxlogout'
@@ -32,12 +31,12 @@ source=(fluxboxexit
 	oblogout_blur
 	http://www.oberon.at/oberon/src/OutMok.tar.xz
 	switch-user.patch)
-md5sums=('f10cb96555b02245d944b381abb14221'
-         '67eff1ab5310456841c887ad6b06bf50'
-         '12a8c357f261db5752c7841ed7b4e678'
+md5sums=('36e1bb2227fcb2ea17fd8294e932686e'
+         'ebd13b2914fdfef8a4e5a889258da616'
+         '026c5552b167b39b40883bd39128cb35'
          '0e9d42c6c83022515d3b14275f630f87'
          'a30813dafbe1b9d650db2f237ac1d89d'
-         '86a7a64ae86c0d733f69d37da05eb357')
+         '4bb8046c6d6a9709796afd814feec8f1')
 
 build() {
   cd "$srcdir"
diff --git a/fluxboxexit b/fluxboxexit
index 5c1cb177e56c..c3f4e58c8767 100644
--- a/fluxboxexit
+++ b/fluxboxexit
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/bash
+# /usr/bin/fluxboxexit
 
 case "$1" in
 logout)
diff --git a/ob_blurlock b/ob_blurlock
index eea068539c26..d2233db74402 100755
--- a/ob_blurlock
+++ b/ob_blurlock
@@ -1,5 +1,5 @@
 # !/bin/bash
-# blurlock for oblogout-manjaro
+# /usr/bin/ob_blurlock
 
 if [ -e /tmp/screenshot.png ]; then
   convert /tmp/screenshot.png -blur 0x5 /tmp/screenshotblur.png
diff --git a/oblogout-blurlock.install b/oblogout-blurlock.install
index 87418eda4b7a..3fb61a9cc59b 100644
--- a/oblogout-blurlock.install
+++ b/oblogout-blurlock.install
@@ -1,20 +1,17 @@
 post_install() {
 
 msg() {
-ALL_OFF="\e[1;0m"
-BOLD="\e[1;1m"
-GREEN="${BOLD}\e[1;32m"
-local mesg=$1; shift
-printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-if [ -e /etc/oblogout.conf ]; then
-  msg "existing oblogout.conf will be saved as /etc/oblogout.conf.bak"
-  mv /etc/oblogout.conf /etc/oblogout.conf.bak
-fi
-cp etc/oblogout-manjaro.conf etc/oblogout.conf
+  ALL_OFF="\e[1;0m"
+  BOLD="\e[1;1m"
+  GREEN="${BOLD}\e[1;32m"
+  local mesg=$1; shift
+  printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+  }
+msg "existing oblogout.conf will be saved as /etc/oblogout.conf.bak"
+mv /etc/oblogout.conf /etc/oblogout.conf.bak
+cp etc/oblogout-blurlock.conf etc/oblogout.conf
 }
 
 post_upgrade() {
-	post_install
+  post_install
 }
diff --git a/oblogout.conf b/oblogout.conf
index f37c9852d196..063d6dd594d5 100644
--- a/oblogout.conf
+++ b/oblogout.conf
@@ -20,7 +20,6 @@ cancel = Escape
 
 [commands]
 lock = ob_blurlock
-# lock = i3lock -ec 1f1f1f
 logout = fluxboxexit logout
 switch = dm-tool switch-to-greeter
 suspend = fluxboxexit suspend
diff --git a/switch-user.patch b/switch-user.patch
index 9354a96a5f18..2c63afde1f0c 100644
--- a/switch-user.patch
+++ b/switch-user.patch
@@ -30,4 +30,3 @@ index 69ca4c5..78611e1 100755
 +            self.__exec_cmd(self.cmd_switch)
  
          self.quit()
-