Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Fix root dir detection when using orbit shell (#5844)

Browse source 
* fix old root dir in orbit

* add changes
This commit is contained in:
Michal Nicpon 2022-05-23 13:47:46 -06:00 committed by GitHub
parent 1365bb6cf8
commit 4398644185
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/issue-5734-fix-orbit-shell-root Normal file
View file

@ -0,0 +1 @@
* Fixed an issue with detecting root directory when using `orbit shell`.

15
orbit/cmd/orbit/orbit.go
View file

@ -135,12 +135,7 @@ func main() {
EnvVars: []string{"ORBIT_FLEET_DESKTOP"},
},
}
app.Action = func(c *cli.Context) error {
if c.Bool("version") {
fmt.Println("orbit " + build.Version)
return nil
}
app.Before = func(c *cli.Context) error {
// handle old installations, which had default root dir set to /var/lib/orbit
if c.String("root-dir") == "" {
rootDir := update.DefaultOptions.RootDirectory
@ -155,6 +150,14 @@ func main() {
c.Set("root-dir", rootDir)
}
return nil
}
app.Action = func(c *cli.Context) error {
if c.Bool("version") {
fmt.Println("orbit " + build.Version)
return nil
}
var logFile io.Writer
if logf := c.String("log-file"); logf != "" {
if logDir := filepath.Dir(logf); logDir != "." {