CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 03:08:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

For Linux service users, (#1236)

Browse Source 
* For Linux service users,
use `appdirs.AppDirs().site_data_dir`
instead of `appdirs.AppDirs().user_config_dir

* somewhat important for this to be changed consistently

* need to import os to use it

* travis doesn't like how I was checking in config_dir had been set.
This commit is contained in:
Michael H 2018-01-14 23:35:33 -05:00 committed by Kowlin
parent eb10508c5f
commit b80c327e35
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redbot/core/data_manager.py
View File

@ -1,4 +1,5 @@
import sys import sys
import os
from pathlib import Path from pathlib import Path
from typing import List from typing import List
import hashlib import hashlib
@ -30,7 +31,13 @@ basic_config_default = {
"CORE_PATH_APPEND": "core" "CORE_PATH_APPEND": "core"
} }
config_dir = Path(appdirs.AppDirs("Red-DiscordBot").user_config_dir) config_dir = None
appdir = appdirs.AppDirs("Red-DiscordBot")
if sys.platform == 'linux':
if os.getuid() < 1000:
config_dir = Path(appdir.site_data_dir)
if not config_dir:
config_dir = Path(appdir.user_config_dir)
config_file = config_dir / 'config.json' config_file = config_dir / 'config.json'

16
redbot/setup.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
import os
from copy import deepcopy from copy import deepcopy
from pathlib import Path from pathlib import Path
@ -10,9 +11,20 @@ from redbot.core.json_io import JsonIO
from redbot.core.data_manager import basic_config_default from redbot.core.data_manager import basic_config_default
from redbot.core.cli import confirm from redbot.core.cli import confirm
config_dir = None
appdir = appdirs.AppDirs("Red-DiscordBot") appdir = appdirs.AppDirs("Red-DiscordBot")
config_dir = Path(appdir.user_config_dir) if sys.platform == 'linux':
config_dir.mkdir(parents=True, exist_ok=True) if os.getuid() < 1000:
config_dir = Path(appdir.site_data_dir)
if not config_dir:
config_dir = Path(appdir.user_config_dir)
try:
config_dir.mkdir(parents=True, exist_ok=True)
except PermissionError:
print(
"You don't have permission to write to "
"'{}'\nExiting...".format(config_dir))
sys.exit(1)
config_file = config_dir / 'config.json' config_file = config_dir / 'config.json'