Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use native error checking with exec.ErrDot (#22735)

Browse source 
This was meant to land in #22073 but was blocked until #22732 was merged

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
This commit is contained in:
Yarden Shoham 2023-02-03 19:22:11 +02:00 committed by GitHub
parent cfb1cb1168
commit ce4fd95233
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/setting/setting.go
View file

@ -6,6 +6,7 @@ package setting
import ( import (
"encoding/base64" "encoding/base64"
"errors"
"fmt" "fmt"
"math" "math"
"net" "net"
@ -466,8 +467,7 @@ func getAppPath() (string, error) {
} }
if err != nil { if err != nil {
// FIXME: Once we switch to go 1.19 use !errors.Is(err, exec.ErrDot) if !errors.Is(err, exec.ErrDot) {
if !strings.Contains(err.Error(), "cannot run executable found relative to current directory") {
return "", err return "", err
} }
appPath, err = filepath.Abs(os.Args[0]) appPath, err = filepath.Abs(os.Args[0])