From 9e96a1e165130b93786df26bc147afc474a7de0f Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 2 May 2011 18:47:14 +0000 Subject: [PATCH] Improvements to new python launcher svn: r17379 --- mac/launcher.sh | 3 ++- mac/rungramps.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mac/launcher.sh b/mac/launcher.sh index af0d9fe55..2e2e5b90c 100755 --- a/mac/launcher.sh +++ b/mac/launcher.sh @@ -1,3 +1,4 @@ #!/bin/sh PWD=`dirname $0` -exec "$PWD/python" "$PWD/rungramps.py" $@ +export PYTHON="$PWD/python" +exec "$PYTHON" "$PWD/rungramps.py" $@ diff --git a/mac/rungramps.py b/mac/rungramps.py index ac948eab4..062d29a77 100755 --- a/mac/rungramps.py +++ b/mac/rungramps.py @@ -13,12 +13,15 @@ _conf_path = os.path.join(_res_path, "etc"); _gtk2_conf = os.path.join(_conf_path, "gtk-2.0") sys.path = [_gramps_path, os.path.join(_pylib_path, "lib-dynload"), - os.path.join(_site_lib_path, "pygtk", "2.0"), + os.path.join(_site_lib_path, "pyenchant-1.6.1-py2.6.egg"), os.path.join(_site_lib_path, "gtk-2.0"), _site_lib_path, _pylib_path] sys.prefix = _res_path +os.environ["XDG_DATA_DIRS"]=_share_path +os.environ["DYLD_LIBRARY_PATH"]=_lib_path +os.environ["LD_LIBRARY_PATH"]=_lib_path os.environ["GTK_PATH"] = _res_path os.environ["GTK2_RC_FILES"] = os.path.join(_gtk2_conf, "gtkrc") os.environ["GTK_IM_MODULE_FILE"]= os.path.join(_gtk2_conf, "immodules") @@ -35,6 +38,7 @@ _languages = "" _collation = "" _locale = "" _language = "" +LC_COLLATE = "" try: _languages = subprocess.Popen( [defaults, "read", "-app", "Gramps", "AppleLanguages"],