mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-18 11:44:07 +00:00
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
diff -r -u irods-4.2.0.orig/scripts/irods/paths.py irods-4.2.0/scripts/irods/paths.py
|
|
--- irods-4.2.0.orig/scripts/irods/paths.py 2016-11-15 06:23:55.000000000 +0000
|
|
+++ irods-4.2.0/scripts/irods/paths.py 2016-12-21 15:17:07.437864606 +0000
|
|
@@ -10,7 +10,7 @@
|
|
return os.path.join(root_directory(), 'var', 'lib', 'irods')
|
|
|
|
def config_directory():
|
|
- return os.path.join(root_directory(), 'etc', 'irods')
|
|
+ return os.path.join(os.path.abspath('/'), 'etc', 'irods')
|
|
|
|
def plugins_directory():
|
|
return os.path.join(root_directory(), 'usr', 'lib', 'irods', 'plugins')
|
|
@@ -37,7 +37,7 @@
|
|
|
|
def version_path():
|
|
return os.path.join(
|
|
- irods_directory(),
|
|
+ home_directory(),
|
|
'VERSION.json')
|
|
|
|
def hosts_config_path():
|
|
@@ -64,7 +64,7 @@
|
|
|
|
def log_directory():
|
|
return os.path.join(
|
|
- irods_directory(),
|
|
+ home_directory(),
|
|
'log')
|
|
|
|
def control_log_path():
|
|
@@ -110,8 +110,7 @@
|
|
def server_bin_directory():
|
|
return os.path.join(
|
|
root_directory(),
|
|
- 'usr',
|
|
- 'sbin')
|
|
+ 'bin')
|
|
|
|
def server_executable():
|
|
return os.path.join(
|
|
@@ -132,7 +131,7 @@
|
|
return os.path.join(config_directory(), 'service_account.config')
|
|
|
|
def genosauth_path():
|
|
- return os.path.join(irods_directory(), 'clients', 'bin', 'genOSAuth')
|
|
+ return os.path.join(home_directory(), 'clients', 'bin', 'genOSAuth')
|
|
|
|
def irods_user_and_group_entries():
|
|
try:
|