Merge branch 'ashmckenzie/relocate-bin-install' into 'main'

Move bin/install to support/make_necessary_dirs

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/799

Merged-by: Ash McKenzie <[email protected]>
Reviewed-by: Patrick Bajao <[email protected]>

Author: ashmckenzie

.gitignore

@@ -7,11 +7,7 @@
 .gitlab_shell_secret
 .idea
 /*.log*
-/bin/check
-/bin/gitlab-shell
-/bin/gitlab-shell-authorized-keys-check
-/bin/gitlab-shell-authorized-principals-check
-/bin/gitlab-sshd
+/bin/*
 /gl-code-quality-report.json
 /go_build
 /support/bin/golangci-*

Makefile

@@ -96,16 +96,18 @@ ${GOLANGCI_LINT_FILE}:
 
 setup: make_necessary_dirs bin/gitlab-shell
 
-make_necessary_dirs: _script_install
-_script_install:
-	bin/install
+make_necessary_dirs:
+	support/make_necessary_dirs
 
 compile: bin/gitlab-shell bin/gitlab-sshd
 
-bin/gitlab-shell: $(GO_SOURCES)
+bin:
+	mkdir -p bin
+
+bin/gitlab-shell: bin $(GO_SOURCES)
 	go build $(GOBUILD_FLAGS) -o $(CURDIR)/bin ./cmd/...
 
-bin/gitlab-sshd: $(GO_SOURCES)
+bin/gitlab-sshd: bin $(GO_SOURCES)
 	go build $(GOBUILD_FLAGS) -o $(CURDIR)/bin/gitlab-sshd ./cmd/gitlab-sshd
 
 check:

bin/install renamed to support/make_necessary_dirs

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # Load ROOT_PATH and access the minimum necessary config file
-require_relative '../support/gitlab_config'
+require_relative 'gitlab_config'
 
 config = GitlabConfig.new
 key_dir = File.dirname("#{config.auth_file}")