forked from openlp/openlp
Once and for all, fix the silly version problem!
This commit is contained in:
parent
ed7328f5a0
commit
f8e3021162
@ -78,9 +78,7 @@ class OpenLP(QtGui.QApplication):
|
|||||||
Run the OpenLP application.
|
Run the OpenLP application.
|
||||||
"""
|
"""
|
||||||
#Load and store current Application Version
|
#Load and store current Application Version
|
||||||
filepath = AppLocation.get_directory(AppLocation.AppDir)
|
filepath = AppLocation.get_directory(AppLocation.VersionDir)
|
||||||
if not hasattr(sys, u'frozen'):
|
|
||||||
filepath = os.path.join(filepath, u'openlp')
|
|
||||||
filepath = os.path.join(filepath, u'.version')
|
filepath = os.path.join(filepath, u'.version')
|
||||||
fversion = None
|
fversion = None
|
||||||
try:
|
try:
|
||||||
|
@ -43,9 +43,10 @@ class AppLocation(object):
|
|||||||
ConfigDir = 2
|
ConfigDir = 2
|
||||||
DataDir = 3
|
DataDir = 3
|
||||||
PluginsDir = 4
|
PluginsDir = 4
|
||||||
|
VersionDir = 5
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_directory(dir_type):
|
def get_directory(dir_type=1):
|
||||||
"""
|
"""
|
||||||
Return the appropriate directory according to the directory type.
|
Return the appropriate directory according to the directory type.
|
||||||
|
|
||||||
@ -83,17 +84,18 @@ class AppLocation(object):
|
|||||||
elif dir_type == AppLocation.PluginsDir:
|
elif dir_type == AppLocation.PluginsDir:
|
||||||
plugin_path = None
|
plugin_path = None
|
||||||
app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
|
app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
|
||||||
if sys.platform == u'win32':
|
|
||||||
if hasattr(sys, u'frozen') and sys.frozen == 1:
|
if hasattr(sys, u'frozen') and sys.frozen == 1:
|
||||||
plugin_path = os.path.join(app_path, u'plugins')
|
plugin_path = os.path.join(app_path, u'plugins')
|
||||||
else:
|
|
||||||
plugin_path = os.path.join(app_path, u'openlp', u'plugins')
|
|
||||||
elif sys.platform == u'darwin':
|
|
||||||
plugin_path = os.path.join(app_path, u'plugins')
|
|
||||||
else:
|
else:
|
||||||
plugin_path = os.path.join(
|
plugin_path = os.path.join(
|
||||||
os.path.split(openlp.__file__)[0], u'plugins')
|
os.path.split(openlp.__file__)[0], u'plugins')
|
||||||
return plugin_path
|
return plugin_path
|
||||||
|
elif dir_type == AppLocation.VersionDir:
|
||||||
|
if hasattr(sys, u'frozen') and sys.frozen == 1:
|
||||||
|
plugin_path = os.path.abspath(os.path.split(sys.argv[0])[0])
|
||||||
|
else:
|
||||||
|
plugin_path = os.path.split(openlp.__file__)[0]
|
||||||
|
return plugin_path
|
||||||
|
|
||||||
|
|
||||||
def check_latest_version(config, current_version):
|
def check_latest_version(config, current_version):
|
||||||
|
Loading…
Reference in New Issue
Block a user