Katenary/katenary
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Fix directory check for .git

Browse Source
This commit is contained in:
Patrice Ferlet
2021-12-17 11:46:35 +01:00
parent 3385b61272
commit e0382a8b83
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main.go
View File

@@ -19,18 +19,19 @@ var Version = "master" // set at build time to the git version/tag
var ChartsDir = "chart" var ChartsDir = "chart"
func detectGitVersion() (string, error) { func detectGitVersion() (string, error) {
defaulVersion := "0.0.1"
// Check if .git directory exists // Check if .git directory exists
if s, err := os.Stat(".git"); err != nil { if s, err := os.Stat(".git"); err != nil {
// .git should be a directory // .git should be a directory
if !s.IsDir() { return defaulVersion, errors.New("no git repository found")
return "", errors.New(".git is not a directory") } else if !s.IsDir() {
} // .git should be a directory
return "0.0.1", errors.New("no git repository found") return defaulVersion, errors.New(".git is not a directory")
} }
// check if "git" executable is callable // check if "git" executable is callable
if _, err := exec.LookPath("git"); err != nil { if _, err := exec.LookPath("git"); err != nil {
return "0.0.1", errors.New("git executable not found") return defaulVersion, errors.New("git executable not found")
} }
// exec git log -n1 --pretty=format:"%h" // exec git log -n1 --pretty=format:"%h"
@@ -39,7 +40,7 @@ func detectGitVersion() (string, error) {
// then exec git branch --show-current // then exec git branch --show-current
out, err := exec.Command("git", "branch", "--show-current").Output() out, err := exec.Command("git", "branch", "--show-current").Output()
if err != nil { if err != nil {
return "0.0.1", errors.New("git branch --show-current failed") return defaulVersion, errors.New("git branch --show-current failed")
} else { } else {
currentBranch := strings.TrimSpace(string(out)) currentBranch := strings.TrimSpace(string(out))
// finally, check if the current tag (if exists) correspond to the current commit // finally, check if the current tag (if exists) correspond to the current commit
@@ -53,8 +54,7 @@ func detectGitVersion() (string, error) {
} }
} }
} }
return "0.0.1", errors.New("git log failed") return defaulVersion, errors.New("git log failed")
} }
func main() { func main() {