Skip to content

Commit

Permalink
fix chmod on exec runner
Browse files Browse the repository at this point in the history
  • Loading branch information
spowelljr committed Apr 28, 2023
1 parent 0a5c095 commit 406e689
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions pkg/minikube/command/exec_runner.go
Expand Up @@ -162,23 +162,24 @@ func (e *execRunner) Copy(f assets.CopyableFile) error {
// write to temp location ...
tmpfile, err := os.CreateTemp("", "minikube")
if err != nil {
return errors.Wrapf(err, "error creating tempfile")
return errors.Wrap(err, "error creating tempfile")
}
defer os.Remove(tmpfile.Name())
err = writeFile(tmpfile.Name(), f, os.FileMode(perms))
if err != nil {

// ... set the file permission ...
if err := tmpfile.Chmod(os.FileMode(perms)); err != nil {
return errors.Wrap(err, "error setting file permissions")
}

if err := writeFile(tmpfile.Name(), f, os.FileMode(perms)); err != nil {
return errors.Wrapf(err, "error writing to tempfile %s", tmpfile.Name())
}

// ... then use sudo to move to target ...
_, err = e.RunCmd(exec.Command("sudo", "cp", "-a", tmpfile.Name(), dst))
if err != nil {
// ... then use sudo to move to target
if _, err := e.RunCmd(exec.Command("sudo", "cp", "-a", tmpfile.Name(), dst)); err != nil {
return errors.Wrapf(err, "error copying tempfile %s to dst %s", tmpfile.Name(), dst)
}

// ... then fix file permission that should have been fine because of "cp -a"
err = os.Chmod(dst, os.FileMode(perms))
return err
return nil
}
return writeFile(dst, f, os.FileMode(perms))
}
Expand Down

0 comments on commit 406e689

Please sign in to comment.