diff options
author | Score_Under | 2019-11-21 00:47:36 +0000 |
---|---|---|
committer | Score_Under | 2019-11-21 00:47:36 +0000 |
commit | 823011488eed0b1a3fdb33639ac40ac80550471b (patch) | |
tree | e93457d0aed22df536b8062e67d43e5d092901d4 /paths-in-opt.patch | |
parent | c8fe960b273b9c3651cbe9fcfb4cd9198dbe819c (diff) | |
download | aur-823011488eed0b1a3fdb33639ac40ac80550471b.tar.gz |
Update for v374
Diffstat (limited to 'paths-in-opt.patch')
-rw-r--r-- | paths-in-opt.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/paths-in-opt.patch b/paths-in-opt.patch index d0ed5692ff8c..2e6183008913 100644 --- a/paths-in-opt.patch +++ b/paths-in-opt.patch @@ -1,8 +1,8 @@ diff --git a/include/ClientGUI.py b/include/ClientGUI.py -index 1d39c4f..e506341 100755 +index 479efc1..86cbd71 100755 --- a/include/ClientGUI.py +++ b/include/ClientGUI.py -@@ -397,7 +397,7 @@ class FrameGUI( ClientGUITopLevelWindows.FrameThatResizes ): +@@ -598,7 +598,7 @@ class FrameGUI( ClientGUITopLevelWindows.MainFrameThatResizes ): python_executable = python_executable.replace( 'pythonw', 'python' ) @@ -12,7 +12,7 @@ index 1d39c4f..e506341 100755 cmd = [ python_executable, server_script_path, db_param ] diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py -index 7b45015..47fc32c 100755 +index 9ec3402..0ea9266 100755 --- a/include/HydrusConstants.py +++ b/include/HydrusConstants.py @@ -2,30 +2,9 @@ import os @@ -47,10 +47,10 @@ index 7b45015..47fc32c 100755 +BASE_DIR = os.path.expanduser("~/.local/share/hydrus") PLATFORM_WINDOWS = False - PLATFORM_OSX = False + PLATFORM_MACOS = False @@ -38,23 +17,16 @@ elif sys.platform == 'linux': PLATFORM_LINUX = True RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' ) - RUNNING_FROM_OSX_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) + RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) -BIN_DIR = os.path.join( BASE_DIR, 'bin' ) -HELP_DIR = os.path.join( BASE_DIR, 'help' ) @@ -63,7 +63,7 @@ index 7b45015..47fc32c 100755 DEFAULT_DB_DIR = os.path.join( BASE_DIR, 'db' ) --if PLATFORM_OSX: +-if PLATFORM_MACOS: - - USERPATH_DB_DIR = os.path.join( os.path.expanduser( '~' ), 'Library', 'Hydrus' ) - |