Skip to content

Allow system wide installation #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blitzmann merged 2 commits into from
Apr 14, 2017
Merged

Allow system wide installation #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f50503
Allow game database file to be loaded from a different directory.
StinGer-ShoGuN Apr 12, 2017
c003729
Save HTML export to .pyfa user's directory by default.
StinGer-ShoGuN Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ def defPaths(customSavePath):
# The database where the static EVE data from the datadump is kept.
# This is not the standard sqlite datadump but a modified version created by eos
# maintenance script
gameDB = os.path.join(pyfaPath, "eve.db")
gameDB = getattr(configforced, "gameDB", gameDB)
if not gameDB:
gameDB = os.path.join(pyfaPath, "eve.db")

# DON'T MODIFY ANYTHING BELOW
import eos.config
Expand Down
2 changes: 1 addition & 1 deletion service/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def getInstance(cls):

def __init__(self):
serviceHTMLExportDefaultSettings = {
"path" : config.pyfaPath + os.sep + 'pyfaFits.html',
"path" : config.savePath + os.sep + 'pyfaFits.html',
"minimal": False
}
self.serviceHTMLExportSettings = SettingsProvider.getInstance().getSettings(
Expand Down