Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

process a tilde for home folder #2342

Merged
merged 1 commit into from
Aug 21, 2024
Merged

process a tilde for home folder #2342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ziti/cmd/edge/quickstart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ import (
"net/http"
"os"
"os/signal"
"os/user"
"strconv"
"strings"
"syscall"
"time"
)
Expand Down Expand Up @@ -100,6 +102,17 @@ func (o *QuickstartOpts) run(ctx context.Context) {
o.Home = tmpDir
o.cleanOnExit = true
} else {
//normalize path
if strings.HasPrefix(o.Home, "~") {
usr, err := user.Current()
if err != nil {
logrus.Fatalf("Could not find user's home directory?")
return
}
home := usr.HomeDir
// Replace only the first instance of ~ in case it appears later in the path
o.Home = strings.Replace(o.Home, "~", home, 1)
}
logrus.Infof("permanent --home '%s' will not be removed on exit", o.Home)
}
if o.ControllerAddress != "" {
Expand Down
Loading