pyrox.dev
1diff -r -u irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp irods-4.2.0/lib/core/src/irods_default_paths.cpp
2--- irods-4.2.0.orig/lib/core/src/irods_default_paths.cpp 2016-11-15 06:23:55.000000000 +0000
3+++ irods-4.2.0/lib/core/src/irods_default_paths.cpp 2016-12-20 18:03:17.156883399 +0000
4@@ -18,7 +18,7 @@
5 try {
6 boost::filesystem::path path{dl_info.dli_fname};
7 path = boost::filesystem::canonical(path);
8- path.remove_filename().remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install
9+ path.remove_filename().remove_filename(); // Removes filename and the two directories (usr and lib) between libirods_common.so and base of irods install
10 return path;
11 } catch(const boost::filesystem::filesystem_error& e) {
12 THROW(-1, e.what());
13@@ -27,8 +27,7 @@
14
15 boost::filesystem::path
16 get_irods_config_directory() {
17- boost::filesystem::path path{get_irods_root_directory()};
18- path.append("etc").append("irods");
19+ boost::filesystem::path path("/etc/irods");
20 return path;
21 }
22
23diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
24--- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000
25+++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000
26@@ -10,7 +10,7 @@
27 return os.path.join(root_directory(), 'var', 'lib', 'irods')
28
29 def config_directory():
30- return os.path.join(root_directory(), 'etc', 'irods')
31+ return os.path.join(os.path.abspath('/'), 'etc', 'irods')
32
33 def plugins_directory():
34 return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins')
35@@ -37,7 +37,7 @@
36
37 def version_path():
38 return os.path.join(
39- irods_directory(),
40+ home_directory(),
41 'VERSION.json')
42
43 def hosts_config_path():
44@@ -64,7 +64,7 @@
45
46 def log_directory():
47 return os.path.join(
48- irods_directory(),
49+ home_directory(),
50 'log')
51
52 def control_log_path():
53@@ -110,8 +110,7 @@
54 def server_bin_directory():
55 return os.path.join(
56 root_directory(),
57- 'usr',
58- 'sbin')
59+ 'bin')
60
61 def server_executable():
62 return os.path.join(
63@@ -132,7 +131,7 @@
64 return os.path.join(config_directory(), 'service_account.config')
65
66 def genosauth_path():
67- return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth')
68+ return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth')
69
70 def irods_user_and_group_entries():
71 try: