Merge branch 'remove/osext' into 'master'

Remove osext

See merge request gitlab-org/gitlab-pages!488

3 files changed, 1 insertions, 5 deletions

diff --git a/daemon.go b/daemon.go
index 48962b19..be790417 100644
--- a/daemon.go
+++ b/daemon.go
@@ -12,7 +12,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/kardianos/osext"
 	log "github.com/sirupsen/logrus"
 
 	"gitlab.com/gitlab-org/gitlab-pages/internal/config"
@@ -53,7 +52,7 @@ func daemonMain() {
 }
 
 func daemonReexec(uid, gid uint, args ...string) (cmd *exec.Cmd, err error) {
-	path, err := osext.Executable()
+	path, err := os.Executable()
 	if err != nil {
 		return
 	}
diff --git a/go.mod b/go.mod
index be922247..b99b97b1 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/gorilla/sessions v1.2.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jstemmer/go-junit-report v0.9.1
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/karlseguin/ccache/v2 v2.0.6
 	github.com/karrick/godirwalk v1.10.12
 	github.com/namsral/flag v1.7.4-pre
diff --git a/go.sum b/go.sum
index 1d1b21d9..2f750924 100644
--- a/go.sum
+++ b/go.sum
@@ -266,8 +266,6 @@ github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVE
 github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
-github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
-github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/karlseguin/ccache/v2 v2.0.6 h1:jFCLz4bF4EPfuCcvESAgYNClkEb31LV3WzyOwLlFz7w=
 github.com/karlseguin/ccache/v2 v2.0.6/go.mod h1:2BDThcfQMf/c0jnZowt16eW405XIqZPavt+HoYEtcxQ=
 github.com/karlseguin/expect v1.0.2-0.20190806010014-778a5f0c6003 h1:vJ0Snvo+SLMY72r5J4sEfkuE7AFbixEP2qRbEcum/wA=