From 5dcd6000fa987fbb74a417ba24c2fe0e93e48691 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolargo@nicolargo-fujitsu.(none)>
Date: Tue, 3 Jan 2012 22:56:41 +0100
Subject: [PATCH] Add a buildout.cfg

---
 TODO           |  4 +++-
 buildout.cfg   | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/glances.py |  9 ++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 buildout.cfg

diff --git a/TODO b/TODO
index 5d40f1e9..8ab3384b 100644
--- a/TODO
+++ b/TODO
@@ -1 +1,3 @@
-- Packaging for Linux / BSD distribution (need contributors)
+- Packaging for .deb Linux distributions (contributors are welcome)
+- Test/coding for xBSD
+- Help (with a curses.paneli object)
diff --git a/buildout.cfg b/buildout.cfg
new file mode 100644
index 00000000..4073a18b
--- /dev/null
+++ b/buildout.cfg
@@ -0,0 +1,58 @@
+# Using buildout to install glances (thx to Benoit !)
+# 
+# Install system dependancies (debian example with python2.7 pinned from wheezy)
+#   $ sudo apt-get install build-essential libstatgrab-dev python2.7-dev
+#
+# Bootstrap buildout
+#   $ mkdir glances
+#   $ cd glances
+#   $ wget http://svn.zope.org/*checkout*/zc.buildout/trunk/bootstrap/bootstrap.py
+#   $ python2.7 bootstrap.py -d
+#   $ bin/buildout
+#
+# Run glances !
+#   $ bin/glances
+#
+# Note: Having a console script entry point in setup.py will be cleanner that
+# defining it in buildout and avoid the dirty extra-path (anyone know a 
+# cleanner solution ?)
+# See http://guide.python-distribute.org/creation.html#entry-points
+
+
+
+[buildout]
+parts = 
+    pystatgrab-src
+    pystatgrab-install
+    glances
+
+include-site-packages = false
+allowed-eggs-from-site-packages = false
+
+[config]
+glances_version = 1.3.4
+pystatgrab_version = 0.5
+pystatgrab_download_url = http://ftp.uk.i-scream.org/sites/ftp.i-scream.org/pub/i-scream/pystatgrab
+
+[pystatgrab-src]
+recipe = hexagonit.recipe.download
+url = ${config:pystatgrab_download_url}/pystatgrab-${config:pystatgrab_version}.tar.gz
+
+[pystatgrab-install]
+recipe= iw.recipe.cmd
+on_install = true
+cmds =
+    cd ${buildout:directory}/parts/pystatgrab-src/pystatgrab-${config:pystatgrab_version}
+    ${buildout:executable} setup.py install
+
+[glances]
+recipe=zc.recipe.egg
+extra-paths = 
+    ${buildout:eggs-directory}/Glances-${config:glances_version}-py2.7.egg/src/
+
+entry-points = glances=glances:main
+
+eggs = 
+    glances == ${config:glances_version}
+    pystatgrab == ${config:pystatgrab_version}
+
diff --git a/src/glances.py b/src/glances.py
index 251990e8..9af222c2 100755
--- a/src/glances.py
+++ b/src/glances.py
@@ -770,6 +770,15 @@ def printSyntax():
 	print "\t-h:\tDisplay the syntax and exit"
 	print "\t-t sec:\tSet the refresh time in second default is 1"
 	print "\t-v:\tDisplay the version and exit"
+	print ""
+	print "When Glances is running, you can press:"
+	print "'a' to set the automatic mode. The processes are sorted automatically"
+	print "'c' to sort the processes list by CPU consumption"
+	print "'d' to disable or enable the disk IO stats"
+	print "'f' to disable or enable the file system stats"
+	print "'m' to sort the processes list by process size"
+	print "'n' to disable or enable the network interfaces stats"
+	print "'q' to exit"
 
 	
 def init():