diff options
| author | suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com> | 2023-03-22 01:37:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-21 17:37:23 -0700 |
| commit | fd325ef1cc1d3e78b5e7686819e05606cc79d963 (patch) | |
| tree | 1372e0efa0ca47b0045b4d29c40bb3a8caeadfc1 /backend/settings.py | |
| parent | faf46ba53354b6dcfbfae25e605bf567acd19376 (diff) | |
| download | decky-loader-fd325ef1cc1d3e78b5e7686819e05606cc79d963.tar.gz decky-loader-fd325ef1cc1d3e78b5e7686819e05606cc79d963.zip | |
Add cross-platform support to decky (#387)
* Import generic watchdog observer over platform specific import
* Use os.path rather than genericpath
* Split off socket management in plugin.py
* Don't specify multiprocessing start type
Default on linux is already fork
* Move all platform-specific functions to seperate files
TODO: make plugin.py platform agnostic
* fix import
* add backwards compat to helpers.py
* add backwards compatibility to helpers.py harder
* Testing autobuild for win
* Testing autobuild for win, try 2
* Testing autobuild for win, try 3
* Testing autobuild for win, try 4
* Create the plugins folder before attempting to use it
* Implement win get_username()
* Create win install script
* Fix branch guess from version
* Create .loader.version in install script
* Add .cmd shim to facilitate auto-restarts
* Properly fix branch guess from version
* Fix updater on windows
* Try 2 of fixing updates for windows
* Test
* pain
* Update install script
* Powershell doesn't believe in utf8
* Powershell good
* add ON_LINUX variable to localplatform
* Fix more merge issues
* test
* Move custom imports to main.py
* Move custom imports to after __main__ check
Due to windows' default behaviour being spawn, it will spawn a new process and thus import into sys.path multiple times
* Log errors in get_system_pythonpaths() and get_loader_version() +
split get_system_pythonpaths() on newline
* Remove whitespace in result of get_system_pythonpaths()
* use python3 on linux and python on windows in get_system_pythonpaths()
* Remove fork-specific urls
* Fix MIME types not working on Windows
Diffstat (limited to 'backend/settings.py')
| -rw-r--r-- | backend/settings.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/backend/settings.py b/backend/settings.py index 64b04c60..3bad6875 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -1,14 +1,13 @@ from json import dump, load from os import mkdir, path, listdir, rename -from shutil import chown +from localplatform import chown, folder_owner +from customtypes import UserType -from helpers import get_home_path, get_homebrew_path, get_user, get_user_group, get_user_owner +from helpers import get_homebrew_path class SettingsManager: def __init__(self, name, settings_directory = None) -> None: - USER = get_user() - GROUP = get_user_group() wrong_dir = get_homebrew_path() if settings_directory == None: settings_directory = path.join(wrong_dir, "settings") @@ -18,7 +17,7 @@ class SettingsManager: #Create the folder with the correct permission if not path.exists(settings_directory): mkdir(settings_directory) - chown(settings_directory, USER, GROUP) + chown(settings_directory) #Copy all old settings file in the root directory to the correct folder for file in listdir(wrong_dir): @@ -29,8 +28,9 @@ class SettingsManager: #If the owner of the settings directory is not the user, then set it as the user: - if get_user_owner(settings_directory) != USER: - chown(settings_directory, USER, GROUP) + + if folder_owner(settings_directory) != UserType.HOST_USER: + chown(settings_directory, UserType.HOST_USER, False) self.settings = {} |