github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-30 06:37:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

Always restart the screen when saving with sudo

Browse Source 
Fixes #723
This commit is contained in:
Zachary Yedidia
2017-07-08 15:13:42 -04:00
parent e4751fd84c
commit 030a05c103
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/micro/buffer.go
View File

@@ -403,17 +403,9 @@ func (b *Buffer) SaveAsWithSudo(filename string) error {
b.UpdateRules() b.UpdateRules()
b.Path = filename b.Path = filename
// The user may have already used sudo in which case we won't need the password // Shut down the screen because we're going to interact directly with the shell
// It's a bit nicer for them if they don't have to enter the password every time screen.Fini()
_, err := RunShellCommand("sudo -v") screen = nil
needPassword := err != nil
// If we need the password, we have to close the screen and ask using the shell
if needPassword {
// Shut down the screen because we're going to interact directly with the shell
screen.Fini()
screen = nil
}
// Set up everything for the command // Set up everything for the command
cmd := exec.Command("sudo", "tee", filename) cmd := exec.Command("sudo", "tee", filename)
@@ -431,13 +423,10 @@ func (b *Buffer) SaveAsWithSudo(filename string) error {
// Start the command // Start the command
cmd.Start() cmd.Start()
err = cmd.Wait() err := cmd.Wait()
// If we needed the password, we closed the screen, so we have to initialize it again // Start the screen back up
if needPassword { InitScreen()
// Start the screen back up
InitScreen()
}
if err == nil { if err == nil {
b.IsModified = false b.IsModified = false
b.ModTime, _ = GetModTime(filename) b.ModTime, _ = GetModTime(filename)