quick commit

7 files changed, 31 insertions, 49 deletions

diff --git a/Makefile b/Makefile
index 5e44f7d..e6eee1f 100644
--- a/Makefile
+++ b/Makefile
@@ -23,20 +23,14 @@ install:
 deinstall:
 	test ! -z "$(DESTDIR)" && test -f $(DESTDIR)/usr/bin/$(NAME) && rm $(DESTDIR)/usr/bin/$(NAME) || exit 0
 	test ! -z "$(DESTDIR)/usr/share/$(NAME)" && -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0
-clean:
-	test -f .version && rm .version
+deb: version
+	dpkg-buildpackage
+cleanall: clean-top
 	test -f nytprof.out && rm nytprof.out
 	test -f tmon.out && rm tmon.out
 	test -d nytprof && rm -Rf nytprof
-deb: 
-	dpkg-buildpackage
 clean-top:
 	rm ../$(NAME)_*.tar.gz
 	rm ../$(NAME)_*.dsc
 	rm ../$(NAME)_*.changes
 	rm ../$(NAME)_*.deb
-tmp-top:
-	mv ../$(NAME)_*.tar.gz /tmp
-	mv ../$(NAME)_*.dsc /tmp
-	mv ../$(NAME)_*.changes /tmp
-	mv ../$(NAME)_*.deb /tmp
diff --git a/docs/loadbars.1 b/docs/loadbars.1
index 86590ef..2494a07 100644
--- a/docs/loadbars.1
+++ b/docs/loadbars.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "LOADBARS 1"
-.TH LOADBARS 1 "2013-04-08" "loadbars 0.6.0.99" "User Commands"
+.TH LOADBARS 1 "2013-06-17" "loadbars 0.6.0.99" "User Commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -133,6 +133,9 @@
 loadbars \- A small and humble tool to observe server loads
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
+.SS "Tested platforms"
+.IX Subsection "Tested platforms"
+This version of loadbars has only been tested on Debian GNU/Linux Squeeze.
 .SS "I like flying elephants"
 .IX Subsection "I like flying elephants"
 For any startup params help check out \-\-help on command line or 'h' during program
@@ -176,8 +179,6 @@ pk = Max us+sy peak of last avg. samples (extended)
 avg = System load average; desc. order: 1, 5 and 15 min. avg.
 .PP
 1px horizontal line: Maximum sy+us+io of last 'avg' samples (extended)
-.PP
-Extended means: text display only if extended mode is turned on
 .SS "Memory stuff"
 .IX Subsection "Memory stuff"
 Ram: System ram usage in %, Color: Dark grey
@@ -198,13 +199,9 @@ Loadbars tries to read ~/.loadbarsrc and it's possible to configure any option y
 .Sp
 .RS 4
 showcores=1 # Always show cores on startup
-.Sp
-showtext=0 # Always don't display text on startup
-.Sp
-extended=1 # Always use extended mode on startup
 .RE
 .PP
-will always show all \s-1CPU\s0 cores in extended mode but no text display. If you press the 'w' hotkey during program execution your config file will be overwritten using the current settings.
+will always show all \s-1CPU\s0 cores. If you press the 'w' hotkey during program execution your config file will be overwritten using the current settings.
 .SH "LICENSE"
 .IX Header "LICENSE"
 See package description or project website.
diff --git a/docs/loadbars.pod b/docs/loadbars.pod
index ca5b193..fac961c 100644
--- a/docs/loadbars.pod
+++ b/docs/loadbars.pod
@@ -56,8 +56,6 @@ avg = System load average; desc. order: 1, 5 and 15 min. avg.
 
 1px horizontal line: Maximum sy+us+io of last 'avg' samples (extended)
 
-Extended means: text display only if extended mode is turned on
-
 =head2 Memory stuff
 
 Ram: System ram usage in %, Color: Dark grey
@@ -80,13 +78,9 @@ Loadbars tries to read ~/.loadbarsrc and it's possible to configure any option y
 
 showcores=1 # Always show cores on startup
 
-showtext=0 # Always don't display text on startup
-
-extended=1 # Always use extended mode on startup
-
 =back
 
-will always show all CPU cores in extended mode but no text display. If you press the 'w' hotkey during program execution your config file will be overwritten using the current settings. 
+will always show all CPU cores. If you press the 'w' hotkey during program execution your config file will be overwritten using the current settings. 
 
 
 =head1 LICENSE
diff --git a/docs/loadbars.txt b/docs/loadbars.txt
index 62d45ee..f06aa92 100644
--- a/docs/loadbars.txt
+++ b/docs/loadbars.txt
@@ -2,6 +2,10 @@ NAME
     loadbars - A small and humble tool to observe server loads
 
 SYNOPSIS
+  Tested platforms
+    This version of loadbars has only been tested on Debian GNU/Linux
+    Squeeze.
+
   I like flying elephants
     For any startup params help check out --help on command line or 'h'
     during program execution.
@@ -55,8 +59,6 @@ INFO
 
     1px horizontal line: Maximum sy+us+io of last 'avg' samples (extended)
 
-    Extended means: text display only if extended mode is turned on
-
   Memory stuff
     Ram: System ram usage in %, Color: Dark grey
 
@@ -81,13 +83,9 @@ INFO
 
         showcores=1 # Always show cores on startup
 
-        showtext=0 # Always don't display text on startup
-
-        extended=1 # Always use extended mode on startup
-
-    will always show all CPU cores in extended mode but no text display. If
-    you press the 'w' hotkey during program execution your config file will
-    be overwritten using the current settings.
+    will always show all CPU cores. If you press the 'w' hotkey during
+    program execution your config file will be overwritten using the current
+    settings.
 
 LICENSE
     See package description or project website.
diff --git a/lib/Loadbars/Constants.pm b/lib/Loadbars/Constants.pm
index 4421c4a..6302aee 100644
--- a/lib/Loadbars/Constants.pm
+++ b/lib/Loadbars/Constants.pm
@@ -27,7 +27,7 @@ use constant {
     DARK_GREY          => [ 0x15, 0x15, 0x15 ],
     YELLOW0            => [ 0xff, 0xa0, 0x00 ],
     YELLOW             => [ 0xff, 0xc0, 0x00 ],
-    COLOR_WHITE        => SDL::Color->new(0xff, 0xff, 0xff),
+    COLOR_WHITE        => SDL::Color->new( 0xff, 0xff, 0xff ),
     SYSTEM_BLUE0       => 30,
     USER_ORANGE        => 70,
     USER_YELLOW0       => 50,
diff --git a/lib/Loadbars/Main.pm b/lib/Loadbars/Main.pm
index 8faa60f..fef9591 100644
--- a/lib/Loadbars/Main.pm
+++ b/lib/Loadbars/Main.pm
@@ -94,7 +94,6 @@ sub threads_terminate_pids (@) {
         #$_->join() for @threads;
     }
 
-
     say '';
 
     display_info 'Terminating done. I\'ll be back!';
diff --git a/lib/Loadbars/Shared.pm b/lib/Loadbars/Shared.pm
index 79c2229..083dee9 100644
--- a/lib/Loadbars/Shared.pm
+++ b/lib/Loadbars/Shared.pm
@@ -40,20 +40,20 @@ our %I : shared;
 
 # Setting defaults
 %C = (
-    title        => undef,
-    barwidth     => 35,
-    cpuaverage   => 15,
-    extended     => 0,
-    hasagent     => 0,
-    height       => 230,
-    maxwidth     => 1250,
-    netaverage   => 15,
-    netint       => '',
-    netlink      => 'gbit',
-    showcores    => 0,
-    showmem      => 0,
-    shownet      => 0,
-    sshopts      => '',
+    title      => undef,
+    barwidth   => 35,
+    cpuaverage => 15,
+    extended   => 0,
+    hasagent   => 0,
+    height     => 230,
+    maxwidth   => 1250,
+    netaverage => 15,
+    netint     => '',
+    netlink    => 'gbit',
+    showcores  => 0,
+    showmem    => 0,
+    shownet    => 0,
+    sshopts    => '',
 );
 
 %I = (