Tidy up.

4 files changed, 18 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 20666ee..067fedc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,13 @@
+# Maintainer (Archey): Laurie Clark-Michalek <bluepeppers@archlinux.us>
+# Contributer (Archey): graysky <graysky AT archlinux DOR us>
 # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=paraboley
-pkgver=0.2
+pkgver=0.3
 pkgrel=1
-pkgdesc="Python script to display system infomation alongside the Parabola GNU / Linux-libre logo."
+pkgdesc="Python script to display system infomation alongside the Parabola logo."
 arch=('any')
-url="https://projects.parabola.nu/paraboley.git"
+url="https://git.parabola.nu/packages/paraboley.git"
 license=('GPL')
 depends=('python')
 makedepends=('git' 'python-distribute')
@@ -14,9 +16,9 @@ optdepends=(
 'python-logbook-git: for logging'
 'imagemagick: for default screenshot command'
 )
-conflicts=()
-provides=('paraboley')
-source="git://projects.parabola.nu/paraboley.git"
+replaces=('archey' 'archey3')
+source=("git://git.parabola.nu/packages/paraboley.git")
+md5sums=('SKIP')
 
 pkgver() {
 	cd ${pkgname}
@@ -26,5 +28,5 @@ pkgver() {
 package() {
 	cd "$srcdir/$pkgname"
 	python setup.py install --root=${pkgdir}
-	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/paraboley/COPYING
+	install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/README.md b/README.md
index e24e8fe..b8e7b14 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 Paraboley
-========
+=========
 
-Paraboley is a system infomation printer, designed to be used when taking screenshots of computer desktops to provide additional infomation about the operating system setup. Paraboley is designed to be used for Parabola GNU / Linux-libre, and it acordingly prints out the Parabola GNU / Linux-libre logo along side the system infomation.
\ No newline at end of file
+Paraboley is a system infomation printer, designed to be used when taking screenshots of computer desktops to provide additional infomation about the operating system setup. Paraboley is designed to be used for Parabola GNU/Linux-libre, and it acordingly prints out the Parabola GNU/Linux-libre logo along side the system infomation.
diff --git a/paraboley b/paraboley
index 0f9ce61..313a880 100755
--- a/paraboley
+++ b/paraboley
@@ -1,20 +1,18 @@
 #!/usr/bin/env python
 #
-# Paraboley is a forked made by Aurélien DESBIRÈRES <aurelien@hackers.camp>
-# of archey3 to present the Parabola GNU / Linux-libre logo and informations
+# Paraboley is a fork of Archey3 made by Aurélien DESBIRÈRES <aurelien@hackers.camp>
 #
 # paraboley
 #
 # Distributed under the terms of the GNU General Public License v3.
 # See http://www.gnu.org/licenses/gpl.txt for the full license text.
 #
-# Simple python script to display an Parabola logo in ASCII art
+# Simple python script to display a Parabola logo in ASCII art
 # Along with basic system information.
 
 __version__ = "0.3"
 
 # Import libraries
-
 import collections
 import subprocess, optparse, re, sys, configparser
 from subprocess import Popen, PIPE
@@ -99,6 +97,7 @@ WM_DICT = collections.OrderedDict([
         ('awesome', 'Awesome'),
         ('beryl', 'Beryl'),
         ('blackbox', 'Blackbox'),
+        ('bspwm', 'bspwm'),
         ('dwm', 'DWM'),
         ('enlightenment', 'Enlightenment'),
         ('fluxbox', 'Fluxbox'),
@@ -246,7 +245,7 @@ class fsDisplay(display):
     def format_output(self, instring):
         try:
             decimal_point = self.call_command(
-                'locale -ck decimal_point').split('\n')[1].split('=')[1]
+                'locale -ck decimal_point').split('\n')[1].split('=')[1].strip('\"')
         except Exception as e:
             self.state.logger.warning('Could not determine locale decimal point,' +
                    'defaulting to \'.\', failed with error {0}'.format(e))
diff --git a/setup.py b/setup.py
index 84e752e..6986a28 100644
--- a/setup.py
+++ b/setup.py
@@ -6,12 +6,12 @@ def read(fname):
 
 setup(
     name="Paraboley",
-    version="0.2",
+    version="0.3",
     author="Aurélien DESBRIÈRES",
     author_email="aurelien@hackers.camp",
-    description="A simple python scrip to display an Parabola GNU / Linux-libre logo in ASCII art along with basic system information.",
+    description="A simple python script to display a Parabola GNU/Linux-libre logo in ASCII art along with basic system information.",
     license="GPL",
-    url="https://projects.parabola.nu/paraboley.git",
+    url="https://git.parabola.nu/packages/paraboley.git",
     long_description=read("README.md"),
     scripts=["paraboley"]
 )