Skip to content
This repository was archived by the owner on Mar 12, 2020. It is now read-only.

Commit 045d541

Browse files
committed
write empty settings file only if none exists
1 parent f8d3014 commit 045d541

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

SQLTools.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
connections = None
3636
history = None
3737

38+
def getSublimeUserFolder():
39+
return os.path.join(sublime.packages_path(), 'User')
3840

3941
def startPlugin():
4042
global USER_FOLDER, DEFAULT_FOLDER
@@ -43,7 +45,7 @@ def startPlugin():
4345
global QUERIES_FILENAME, QUERIES_FILENAME_DEFAULT
4446
global settings, queries, connections, history
4547

46-
USER_FOLDER = os.path.join(sublime.packages_path(), 'User')
48+
USER_FOLDER = getSublimeUserFolder()
4749
DEFAULT_FOLDER = os.path.dirname(__file__)
4850

4951
SETTINGS_FILENAME = os.path.join(USER_FOLDER, SQLTOOLS_SETTINGS_FILE)
@@ -588,7 +590,10 @@ def plugin_loaded():
588590
# which is not desirable and prevents future changes to queries and other
589591
# sensible defaults defined in settings file, as those would be overriden by content
590592
# from older versions of SQLTools in 'User\SQLTools.sublime-settings'
591-
sublime.save_settings(SQLTOOLS_SETTINGS_FILE)
593+
sublimeUserFolder = getSublimeUserFolder()
594+
userSettingFile = os.path.join(sublimeUserFolder, SQLTOOLS_SETTINGS_FILE)
595+
if not os.path.isfile(userSettingFile):
596+
sublime.save_settings(SQLTOOLS_SETTINGS_FILE)
592597

593598
try:
594599
from package_control import events

0 commit comments

Comments
 (0)