diff options
| author | Score_Under | 2022-04-14 20:40:32 +0100 |
|---|---|---|
| committer | Score_Under | 2022-04-14 20:40:32 +0100 |
| commit | b21e088b9fdb0adfddde903748872f602535c5f4 (patch) | |
| tree | a5083c7df7d3b21e0c7224e3e8c3074970704944 /paths-in-opt.patch | |
| parent | 448cf719219c40efb8bfe8c7ce8f2b0e6d2fd912 (diff) | |
| download | aur-b21e088b9fdb0adfddde903748872f602535c5f4.tar.gz | |
Update for v481
Diffstat (limited to 'paths-in-opt.patch')
| -rw-r--r-- | paths-in-opt.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/paths-in-opt.patch b/paths-in-opt.patch index 64ec3007c32a..f8fd5d00b701 100644 --- a/paths-in-opt.patch +++ b/paths-in-opt.patch @@ -1,8 +1,8 @@ diff --git a/hydrus/client/gui/ClientGUI.py b/hydrus/client/gui/ClientGUI.py -index 418c93e..91e2683 100644 +index 944af47..8e9bcce 100644 --- a/hydrus/client/gui/ClientGUI.py +++ b/hydrus/client/gui/ClientGUI.py -@@ -4133,7 +4133,7 @@ class FrameGUI( ClientGUITopLevelWindows.MainFrameThatResizes ): +@@ -5969,7 +5969,7 @@ class FrameGUI( ClientGUITopLevelWindows.MainFrameThatResizes ): python_executable = python_executable.replace( 'pythonw', 'python' ) @@ -12,10 +12,10 @@ index 418c93e..91e2683 100644 cmd = [ python_executable, server_script_path, db_param ] diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py -index db6a88b..49e5fdb 100644 +index 03453fe..7a53939 100644 --- a/hydrus/core/HydrusConstants.py +++ b/hydrus/core/HydrusConstants.py -@@ -5,33 +5,9 @@ import typing +@@ -7,34 +7,9 @@ import yaml # old method of getting frozen dir, doesn't work for symlinks looks like: # BASE_DIR = getattr( sys, '_MEIPASS', None ) @@ -46,13 +46,14 @@ index db6a88b..49e5fdb 100644 - - BASE_DIR = os.getcwd() - +- +RUNNING_FROM_FROZEN_BUILD = False +HYDRUS_MODULE_DIR = '/opt/hydrus/hydrus' +BASE_DIR = os.path.expanduser("~/.local/share/hydrus") muh_platform = sys.platform.lower() -@@ -43,32 +19,16 @@ PLATFORM_HAIKU = muh_platform == 'haiku1' +@@ -46,32 +21,16 @@ PLATFORM_HAIKU = muh_platform == 'haiku1' RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' ) RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) @@ -75,7 +76,8 @@ index db6a88b..49e5fdb 100644 - - desired_userpath_db_dir = os.path.join( '~', 'Hydrus' ) - -- ++USERPATH_DB_DIR = DEFAULT_DB_DIR + -USERPATH_DB_DIR = os.path.expanduser( desired_userpath_db_dir ) - -if USERPATH_DB_DIR == desired_userpath_db_dir: @@ -84,8 +86,7 @@ index db6a88b..49e5fdb 100644 - - USERPATH_DB_DIR = None - -+USERPATH_DB_DIR = DEFAULT_DB_DIR - +- -LICENSE_PATH = os.path.join( BASE_DIR, 'license.txt' ) +LICENSE_PATH = "/usr/share/licenses/hydrus/license.txt" |