[Pytrainer-svn] SF.net SVN: pytrainer:[532] pytrainer/trunk

[<jb...@us...>]

Revision: 532
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=532&view=rev
Author:   jblance
Date:     2010-03-14 02:49:38 +0000 (Sun, 14 Mar 2010)

Log Message:
-----------
Changed startup script to work with different paths

Modified Paths:
--------------
    pytrainer/trunk/bin/pytrainer
    pytrainer/trunk/pytrainer/main.py

Modified: pytrainer/trunk/bin/pytrainer
===================================================================
--- pytrainer/trunk/bin/pytrainer	2010-03-11 08:24:47 UTC (rev 531)
+++ pytrainer/trunk/bin/pytrainer	2010-03-14 02:49:38 UTC (rev 532)
@@ -27,9 +27,16 @@
 import os
 import commands
 
-data_path = "/usr/share/pytrainer/"
-DIR = "/usr/share/locale"
 
+bin_path = os.path.realpath(os.path.dirname(__file__)) # directory that the pytrainer script executes from e.g. /usr/bin or /usr/local/bin
+base_path = os.path.dirname(bin_path) 
+
+data_path = base_path + "/share/pytrainer/"
+DIR = base_path + "/share/locale"
+
+print "data_path: " + data_path
+print "DIR: " + DIR
+
 gettext.bindtextdomain("pytrainer", DIR)
 gtk.glade.bindtextdomain("pytrainer", DIR)
 gtk.glade.textdomain("pytrainer")

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2010-03-11 08:24:47 UTC (rev 531)
+++ pytrainer/trunk/pytrainer/main.py	2010-03-14 02:49:38 UTC (rev 532)
@@ -54,7 +54,7 @@
 from gui.warning import Warning
 from lib.date import Date
 from lib.gpx import Gpx
-from lib.soapUtils import webService
+#from lib.soapUtils import webService
 from lib.ddbb import DDBB
 from lib.xmlUtils import XMLParser
 from lib.system import checkConf
@@ -63,7 +63,7 @@
 class pyTrainer:
 	def __init__(self,filename = None, data_path = None): 
 		#Version constants
-		self.version ="1.7.1_svn#530"
+		self.version ="1.7.1_svn#532"
 		self.DB_version = 3
 		
 		#Setup usage and permitted options


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.