Skip to content

Commit 626957c

Browse files
author
root
committed
Remove ENV['HOME'] dependency
1 parent 92ed625 commit 626957c

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

Diff for: app/views/settings/_gitolite_config_test.html.erb

-6
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@
5757
<td><span class="label label-success"><%= RedmineGitolite::Config.sudo_version_raw %></span></td>
5858
</tr>
5959

60-
<tr>
61-
<td><%= l(:label_home_variable_is_set) %></td>
62-
<% state = !ENV.has_key?('HOME') ? 'important' : 'success' %>
63-
<td><span class="label label-<%= state %>"><%= !ENV.has_key?('HOME') ? l(:label_home_variable_not_set) : ENV['HOME'] %></span></td>
64-
</tr>
65-
6660
<tr>
6761
<td><%= l(:label_sudo_gitolite_to_redmine_user) %></td>
6862
<td><%= image_tag (RedmineGitolite::Config.can_gitolite_sudo_to_redmine_user? ? 'true.png' : 'exclamation.png') %></td>

Diff for: config/locales/plugin_settings/en.yml

-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ en:
166166
label_redmine_user: Redmine username
167167
label_sudo_version: Sudo version
168168
label_git_version: Git version
169-
label_home_variable_is_set: Environment variable '$HOME' is set?
170-
label_home_variable_not_set: Environment variable '$HOME' is not correctly set
171169

172170
# Recycle Bin
173171
label_tab_gitolite_recycle_bin: Recycle Bin

Diff for: config/locales/plugin_settings/fr.yml

-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ fr:
166166
label_redmine_user: Nom d'utilisateur Redmine
167167
label_sudo_version: Version de Sudo
168168
label_git_version: Version de Git
169-
label_home_variable_is_set: La variable d'environnement '$HOME' est initialisée?
170-
label_home_variable_not_set: La variable d'environnement '$HOME' n'est pas correctement initialisée
171169

172170
# Recycle Bin
173171
label_tab_gitolite_recycle_bin: Corbeille

Diff for: db/migrate/20130807223227_migrate_parameters.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ def self.up
66
# Legacy settings
77
new_setting[:gitolite_user] = 'git'
88
new_setting[:gitolite_server_port] = '22'
9-
new_setting[:gitolite_ssh_private_key] = File.join(ENV['HOME'], '.ssh', 'redmine_gitolite_admin_id_rsa').to_s
10-
new_setting[:gitolite_ssh_public_key] = File.join(ENV['HOME'], '.ssh', 'redmine_gitolite_admin_id_rsa.pub').to_s
9+
new_setting[:gitolite_ssh_private_key] = File.join(Rails.root, 'plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa').to_s
10+
new_setting[:gitolite_ssh_public_key] = File.join(Rails.root, 'plugins', 'redmine_git_hosting', 'ssh_keys', 'redmine_gitolite_admin_id_rsa.pub').to_s
1111

1212
new_setting[:gitolite_global_storage_dir] = 'repositories/'
1313
new_setting[:gitolite_redmine_storage_dir] = ''
1414
new_setting[:gitolite_recycle_bin_dir] = 'recycle_bin/'
1515

16-
new_setting[:gitolite_temp_dir] = File.join(ENV['HOME'], 'tmp', 'redmine_git_hosting').to_s
16+
new_setting[:gitolite_temp_dir] = File.join(Rails.root, 'tmp', 'redmine_git_hosting').to_s
1717
new_setting[:gitolite_script_dir] = './'
1818
new_setting[:gitolite_timeout] = 10
1919
new_setting[:gitolite_config_file] = 'gitolite.conf'

0 commit comments

Comments
 (0)