lib/AppConfig.rb in taskjuggler-0.0.7 vs lib/AppConfig.rb in taskjuggler-0.0.8
- old
+ new
@@ -104,10 +104,19 @@
def AppConfig.license
@@license
end
def AppConfig.dataDirs(baseDir = 'data')
+ dirs = dataSearchDirs(baseDir)
+ # Remove non-existing directories from the list again
+ dirs.delete_if do |dir|
+ !File.exists?(dir.untaint)
+ end
+ dirs
+ end
+
+ def AppConfig.dataSearchDirs(baseDir = 'data')
rubyLibDir = RbConfig::CONFIG['rubylibdir']
rubyBaseDir, versionDir = rubyLibDir.scan(/(.*\/)(.*)/)[0]
dirs = []
if ENV['TASKJUGGLER_DATA_PATH']
@@ -121,13 +130,10 @@
dirs << rubyBaseDir + "gems/" + versionDir + '/gems/' \
+ @@packageName + '-' + @@version + "/#{baseDir}/"
# This one is for Debian based distros
dirs << rubyLibDir + '/gems/' \
+ @@packageName + '-' + @@version + "/#{baseDir}/"
- # Remove non-existing directories from the list again
- dirs.delete_if do |dir|
- !File.exists?(dir.untaint)
- end
+
dirs
end
def AppConfig.dataFiles(fileName)
files = []