tjh.dev
1diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
2--- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000
3+++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000
4@@ -10,7 +10,7 @@
5 return os.path.join(root_directory(), 'var', 'lib', 'irods')
6
7 def config_directory():
8- return os.path.join(root_directory(), 'etc', 'irods')
9+ return os.path.join(os.path.abspath('/'), 'etc', 'irods')
10
11 def plugins_directory():
12 return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins')
13@@ -37,7 +37,7 @@
14
15 def version_path():
16 return os.path.join(
17- irods_directory(),
18+ home_directory(),
19 'VERSION.json')
20
21 def hosts_config_path():
22@@ -64,7 +64,7 @@
23
24 def log_directory():
25 return os.path.join(
26- irods_directory(),
27+ home_directory(),
28 'log')
29
30 def control_log_path():
31@@ -110,8 +110,7 @@
32 def server_bin_directory():
33 return os.path.join(
34 root_directory(),
35- 'usr',
36- 'sbin')
37+ 'bin')
38
39 def server_executable():
40 return os.path.join(
41@@ -132,7 +131,7 @@
42 return os.path.join(config_directory(), 'service_account.config')
43
44 def genosauth_path():
45- return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth')
46+ return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth')
47
48 def irods_user_and_group_entries():
49 try: