Fix paths that point to eve.db

Perchinka · Oct 5, 2015 · 3f6c484 · 3f6c484
1 parent 11cf4b3
commit 3f6c484
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/eos/config.py b/eos/config.py
@@ -4,7 +4,7 @@
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "staticdata", "eve.db")), sys.getfilesystemencoding())
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
 saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
 
 #Autodetect path, only change if the autodetection bugs out.

diff --git a/gui/aboutData.py b/gui/aboutData.py
@@ -20,7 +20,7 @@
 
 versionString = "{0} {1} - {2} {3}".format(config.version, config.tag, config.expansionName, config.expansionVersion)
 licenses = (
-    "pyfa is released under GNU GPLv3 - see included gpl.txt",
+    "pyfa is released under GNU GPLv3 - see included LICENSE file",
     "All EVE-Online related materials are property of CCP hf.",
     "Silk Icons Set by famfamfam.com - Creative Commons Attribution 2.5 License",
     "Fat Cow Icons by fatcow.com - Creative Commons Attribution 3.0 License"

diff --git a/scripts/effectUsedBy.py b/scripts/effectUsedBy.py
@@ -65,8 +65,8 @@
 usage = "usage: %prog --database=DB [--debug=DEBUG]"
 parser = OptionParser(usage=usage)
 parser.add_option("-d", "--database", help="path to eve cache data dump in \
-    sqlite format, default to eve database file included in pyfa (../staticdata/eve.db)",
-    type="string", default=os.path.join(script_dir, "..", "staticdata", "eve.db"))
+    sqlite format, default to eve database file included in pyfa (../eve.db)",
+    type="string", default=os.path.join(script_dir, "..", "eve.db"))
 parser.add_option("-e", "--effects", help="explicit comma-separated list of \
 effects to process", type="string", default="")
 parser.add_option("-r", "--remove", help="remove effect files that are not \

diff --git a/scripts/findNonMarket.py b/scripts/findNonMarket.py
@@ -8,7 +8,7 @@
 script_dir = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
 
 # Connect to database and set up cursor
-db = sqlite3.connect(os.path.join(script_dir, "..", "staticdata", "eve.db"))
+db = sqlite3.connect(os.path.join(script_dir, "..", "eve.db"))
 cursor = db.cursor()
 
 # Queries to get raw data

diff --git a/scripts/icons_update.py b/scripts/icons_update.py
@@ -19,8 +19,8 @@
 
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
-db_path = os.path.abspath(os.path.join(script_dir, '..', 'staticdata', 'eve.db'))
-icons_dir = os.path.abspath(os.path.join(script_dir, '..', 'staticdata', 'icons'))
+db_path = os.path.abspath(os.path.join(script_dir, '..', 'eve.db'))
+icons_dir = os.path.abspath(os.path.join(script_dir, '..', 'imgs', 'icons'))
 export_dir = os.path.abspath(os.path.expanduser(os.path.join(args.icons, 'items')))
 
 

diff --git a/scripts/itemDiff.py b/scripts/itemDiff.py
@@ -32,7 +32,7 @@
 import sys
 
 script_dir = os.path.dirname(__file__)
-default_old = os.path.join(script_dir, "..", "staticdata", "eve.db")
+default_old = os.path.join(script_dir, "..", "eve.db")
 
 def main(old, new, groups=True, effects=True, attributes=True, renames=True):
     # Open both databases and get their cursors
@@ -507,4 +507,4 @@ def getattrname(attr):
     parser.add_argument("-r", "--norenames", action="store_false", default=True, dest="renames", help="don't show list of renamed data")
     args = parser.parse_args()
 
-    main(args.old, args.new, args.groups, args.effects, args.attributes, args.renames)
+    main(args.old, args.new, args.groups, args.effects, args.attributes, args.renames)
diff --git a/scripts/prep_data.py b/scripts/prep_data.py
@@ -100,7 +100,7 @@ def header(text, subtext=None):
 ### Diff generation
 import itemDiff
 diff_file = os.path.join(dump_path, "diff.txt")
-old_db = os.path.join(script_path, "..", "staticdata", "eve.db")
+old_db = os.path.join(script_path, "..", "eve.db")
 
 header("Generating DIFF", diff_file)
 old_stdout = sys.stdout

diff --git a/scripts/pyfa-setup.iss b/scripts/pyfa-setup.iss
@@ -46,7 +46,7 @@ AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
-LicenseFile={#MyAppDir}\gpl.txt
+LicenseFile={#MyAppDir}\LICENSE
 OutputDir={#MyOutputDir}
 OutputBaseFilename={#MyOutputFile}
 SetupIconFile={#MyAppDir}\pyfa.ico

diff --git a/scripts/renders_update.py b/scripts/renders_update.py
@@ -19,8 +19,8 @@
 
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
-db_path = os.path.abspath(os.path.join(script_dir, '..', 'staticdata', 'eve.db'))
-icons_dir = os.path.abspath(os.path.join(script_dir, '..', 'staticdata', 'icons', 'ships'))
+db_path = os.path.abspath(os.path.join(script_dir, '..', 'eve.db'))
+icons_dir = os.path.abspath(os.path.join(script_dir, '..', 'imgs', 'renders'))
 export_dir = os.path.abspath(os.path.expanduser(args.renders))