github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24403 from kargakis/use-platform-agnostic-func 

kubectl: use platform-agnostic helper in edit
pull/6/head
Robert Bailey 2016-05-06 13:26:12 -07:00
parent 5916baa387 cf7671d2c4
commit 7df41be489
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/edit.go
View File

@ -22,7 +22,7 @@ import (
"fmt"
"io"
"os"
"path"
"path/filepath"
gruntime "runtime"
"strings"
@ -227,7 +227,7 @@ outter:
// launch the editor
editedDiff := edited
edited, file, err = edit.LaunchTempFile(fmt.Sprintf("%s-edit-", path.Base(os.Args[0])), ext, buf)
edited, file, err = edit.LaunchTempFile(fmt.Sprintf("%s-edit-", filepath.Base(os.Args[0])), ext, buf)
if err != nil {
return preservedFile(err, results.file, errOut)
}
@ -350,7 +350,7 @@ outter:
// 3. invalid: retry those on the spot by looping ie. reloading the editor
if results.retryable > 0 {
fmt.Fprintln(errOut, errorMsg)
fmt.Fprintf(errOut, "You can run `%s replace -f %s` to try this update again.\n", path.Base(os.Args[0]), file)
fmt.Fprintf(errOut, "You can run `%s replace -f %s` to try this update again.\n", filepath.Base(os.Args[0]), file)
continue outter
}
if results.notfound > 0 {