From bbb1de8d2b3f3dfc872308f804743b8c30626791 Mon Sep 17 00:00:00 2001 From: Igor Drozdov Date: Thu, 23 Jul 2020 12:38:37 +0000 Subject: Revert "Update executable.go" This reverts commit 869aeb9057962b089abfd8ce0b6d4a0962bbb154 --- internal/executable/executable.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/internal/executable/executable.go b/internal/executable/executable.go index c6253b1..c6355b9 100644 --- a/internal/executable/executable.go +++ b/internal/executable/executable.go @@ -13,6 +13,11 @@ const ( AuthorizedPrincipalsCheck = "gitlab-shell-authorized-principals-check" ) +type Executable struct { + Name string + RootDir string +} + var ( // osExecutable is overridden in tests osExecutable = os.Executable @@ -36,3 +41,20 @@ func New(name string) (*Executable, error) { return executable, nil } + +func findRootDir(path string) (string, error) { + // Start: /opt/.../gitlab-shell/bin/gitlab-shell + // Ends: /opt/.../gitlab-shell + rootDir := filepath.Dir(filepath.Dir(path)) + pathFromEnv := os.Getenv("GITLAB_SHELL_DIR") + + if pathFromEnv != "" { + if _, err := os.Stat(pathFromEnv); os.IsNotExist(err) { + return "", err + } + + rootDir = pathFromEnv + } + + return rootDir, nil +} -- cgit v1.2.1