From 091b87e70b17aaf580ee97dbc9d5140f29eca68f Mon Sep 17 00:00:00 2001
From: Serge Noiraud <Serge.Noiraud@free.fr>
Date: Fri, 12 Oct 2012 10:59:16 +0000
Subject: [PATCH] The gramps command doesn't work with the new architecture

svn: r20549
---
 gramps.sh.in | 28 ----------------------------
 setup.py     |  6 +++---
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 gramps.sh.in

diff --git a/gramps.sh.in b/gramps.sh.in
deleted file mode 100644
index d1cb8904a..000000000
--- a/gramps.sh.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh
-# @configure_input@
-#
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2000-2006  Donald N. Allingham
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-prefix=@prefix@
-PACKAGE=@PACKAGE@
-
-export GRAMPSDIR=@datadir@/@PACKAGE@
-
-exec @PYTHON@ -O $GRAMPSDIR/grampsapp.py "$@"
diff --git a/setup.py b/setup.py
index 1c64aeee9..edbcd78d6 100644
--- a/setup.py
+++ b/setup.py
@@ -215,9 +215,9 @@ def write_gramps_script(install_cmd, build_scripts):
     '''
     filename = os.path.join(build_scripts, 'gramps')
     f_out = open(filename, 'w')
-    f_out.write('#! /bin/sh\n')
-    f_out.write('export GRAMPSDIR=%sgramps\n' % install_cmd.install_lib)
-    f_out.write('exec %s -O $GRAMPSDIR/gramps.py "$@"\n' % sys.executable)
+    f_out.write('#!/usr/bin/env python\n')
+    f_out.write('import gramps.grampsapp as app\n')
+    f_out.write('app.main()\n')
     f_out.close()
 
     if os.name == 'posix':