blob: 36c05a157242be54522ce9f24dbb703725e55df9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
diff --git a/include/ClientGUI.py b/include/ClientGUI.py
index 92828e0..297bd0e 100755
--- a/include/ClientGUI.py
+++ b/include/ClientGUI.py
@@ -476,7 +476,7 @@ class FrameGUI( ClientGUITopLevelWindows.FrameThatResizes ):
python_executable = python_executable.replace( 'pythonw', 'python' )
- server_script_path = os.path.join( HC.BASE_DIR, 'server.py' )
+ server_script_path = '/opt/hydrus/server.py'
cmd = '"' + python_executable + '" "' + server_script_path + '" ' + db_param
diff --git a/include/HydrusConstants.py b/include/HydrusConstants.py
index bb0a939..8e690e1 100755
--- a/include/HydrusConstants.py
+++ b/include/HydrusConstants.py
@@ -3,30 +3,15 @@ import sys
# dirs
-BASE_DIR = sys.path[0]
-
-if BASE_DIR == '':
-
- BASE_DIR = os.getcwdu()
-
-else:
-
- try:
-
- BASE_DIR = BASE_DIR.decode( 'utf-8' )
-
- except:
-
- pass
-
-
-BIN_DIR = os.path.join( BASE_DIR, 'bin' )
-HELP_DIR = os.path.join( BASE_DIR, 'help' )
-INCLUDE_DIR = os.path.join( BASE_DIR, 'include' )
-STATIC_DIR = os.path.join( BASE_DIR, 'static' )
+BASE_DIR = os.path.expanduser("~/.local/share/hydrus")
+
+BIN_DIR = "/opt/hydrus/bin"
+HELP_DIR = "/opt/hydrus/help"
+INCLUDE_DIR = "/opt/hydrus/include"
+STATIC_DIR = "/opt/hydrus/static"
DEFAULT_DB_DIR = os.path.join( BASE_DIR, 'db' )
-LICENSE_PATH = os.path.join( BASE_DIR, 'license.txt' )
+LICENSE_PATH = "/usr/share/licenses/hydrus/license.txt"
#
|