[geneagrapher] 33/226: Changed method used for script installation.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository geneagrapher.

commit cb7895a1173a4aff9f96c2a441db311ffd21025e
Author: David Alber <alber.david at gmail.com>
Date:   Mon Sep 29 00:53:49 2008 +0000

    Changed method used for script installation.
---
 Geneagrapher/geneagrapher/ggrapher    |  1 -
 Geneagrapher/geneagrapher/ggrapher.py | 21 ++++++++++-----------
 Geneagrapher/setup.py                 |  6 +++++-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Geneagrapher/geneagrapher/ggrapher b/Geneagrapher/geneagrapher/ggrapher
deleted file mode 120000
index c4186be..0000000
--- a/Geneagrapher/geneagrapher/ggrapher
+++ /dev/null
@@ -1 +0,0 @@
-ggrapher.py
\ No newline at end of file
diff --git a/Geneagrapher/geneagrapher/ggrapher.py b/Geneagrapher/geneagrapher/ggrapher.py
index f92804a..02d93f3 100644
--- a/Geneagrapher/geneagrapher/ggrapher.py
+++ b/Geneagrapher/geneagrapher/ggrapher.py
@@ -1,12 +1,11 @@
-#!python
+from geneagrapher import *
 
-from geneagrapher.geneagrapher import *
-
-geneagrapher = Geneagrapher()
-try:
-	geneagrapher.parseInput()
-except SyntaxError, e:
-	print geneagrapher.parser.get_usage()
-	print e
-geneagrapher.buildGraph()
-geneagrapher.generateDotFile()
+def ggrapher():
+	geneagrapher = Geneagrapher()
+	try:
+		geneagrapher.parseInput()
+	except SyntaxError, e:
+		print geneagrapher.parser.get_usage()
+		print e
+	geneagrapher.buildGraph()
+	geneagrapher.generateDotFile()
diff --git a/Geneagrapher/setup.py b/Geneagrapher/setup.py
index a3e8ce4..382a22c 100644
--- a/Geneagrapher/setup.py
+++ b/Geneagrapher/setup.py
@@ -14,7 +14,11 @@ genealogies using data from the Math Genealogy Project's website.
       url="http://www.davidalber.net/",
       packages=find_packages(exclude='tests'),
       install_requires=[],
-      scripts=['geneagrapher/ggrapher.py', 'geneagrapher/ggrapher'],
+      entry_points = {
+        'console_scripts': [
+            'ggrapher = geneagrapher.ggrapher:ggrapher'
+        ]
+      },
       test_suite = "tests.tests"
 )
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/geneagrapher.git