diff options
| author | Florian Klink <flokli@flokli.de> | 2018-11-29 21:18:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 21:18:08 +0100 |
| commit | 43762227f89acb8d882475d206752987688e4a98 (patch) | |
| tree | 389f2c1c0edd1dacd6460a21c2916dbf80dd4eb0 /pkgs | |
| parent | 7b77c7ff9332c68c24f2cfb72ba716a2b89915e1 (diff) | |
| parent | 3caeeabb1484358b5d6d63f346767dc1764c424a (diff) | |
| download | nixlib-43762227f89acb8d882475d206752987688e4a98.tar nixlib-43762227f89acb8d882475d206752987688e4a98.tar.gz nixlib-43762227f89acb8d882475d206752987688e4a98.tar.bz2 nixlib-43762227f89acb8d882475d206752987688e4a98.tar.lz nixlib-43762227f89acb8d882475d206752987688e4a98.tar.xz nixlib-43762227f89acb8d882475d206752987688e4a98.tar.zst nixlib-43762227f89acb8d882475d206752987688e4a98.zip | |
Merge pull request #49385 from krav/gitlab-shell-authorized-keys
gitlab-shell: 8.3.3->8.4.1, fix hardcoded paths
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 6d29f5f9e6c5..3d381404c63b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -43,3 +43,16 @@ index 57c70f5..700569b 100644 end def api +diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb +index 0600a18..6814f0a 100644 +--- a/lib/gitlab_keys.rb ++++ b/lib/gitlab_keys.rb +@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength + attr_accessor :auth_file, :key + + def self.command(whatever) +- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" ++ "/run/current-system/sw/bin/gitlab-shell #{whatever}" + end + + def self.command_key(key_id) |