Compare commits
7 Commits
Author | SHA1 | Date |
---|---|---|
|
e621f228ba | |
|
590ce71782 | |
|
2b1f7f54d5 | |
|
d70cf82ecc | |
|
364d666eb6 | |
|
0146183226 | |
|
098c7d3771 |
47
cmd.go
47
cmd.go
|
@ -2,6 +2,7 @@ package shell
|
|||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
|
@ -241,3 +242,49 @@ func RemoveFirstElement(slice []string) (string, []string) {
|
|||
}
|
||||
return slice[0], slice[1:] // Return the slice without the first element
|
||||
}
|
||||
|
||||
func RunVerbose(cmd []string) (*cmd.Status, error) {
|
||||
pwd, _ := os.Getwd()
|
||||
log.Info("Running:", pwd, cmd)
|
||||
r, err := RunStrict(cmd)
|
||||
if err != nil {
|
||||
log.Info("Error", cmd, err)
|
||||
}
|
||||
for _, line := range r.Stdout {
|
||||
log.Info(line)
|
||||
}
|
||||
for _, line := range r.Stderr {
|
||||
log.Info(line)
|
||||
}
|
||||
return r, err
|
||||
}
|
||||
|
||||
func RunVerboseOnError(cmd []string) (*cmd.Status, error) {
|
||||
r, err := RunStrict(cmd)
|
||||
if err == nil {
|
||||
return r, err
|
||||
}
|
||||
pwd, _ := os.Getwd()
|
||||
log.Info("Run Error:", pwd, cmd, err)
|
||||
for _, line := range r.Stdout {
|
||||
log.Info(line)
|
||||
}
|
||||
for _, line := range r.Stderr {
|
||||
log.Info(line)
|
||||
}
|
||||
return r, err
|
||||
}
|
||||
|
||||
func RunStrict(cmd []string) (*cmd.Status, error) {
|
||||
pwd, _ := os.Getwd()
|
||||
result := PathRunQuiet(pwd, cmd)
|
||||
if result.Error != nil {
|
||||
log.Warn(pwd, cmd, "wow. golang is cool. an os.Error:", result.Error)
|
||||
return &result, result.Error
|
||||
}
|
||||
if result.Exit != 0 {
|
||||
// log.Warn(cmd, "failed with", result.Exit, repo.GetGoPath())
|
||||
return &result, errors.New(fmt.Sprint(cmd, "failed with", result.Exit))
|
||||
}
|
||||
return &result, nil
|
||||
}
|
||||
|
|
25
exec.go
25
exec.go
|
@ -43,6 +43,29 @@ func ExecCheck(args []string) error {
|
|||
log.Info("ExecCheck() err", err)
|
||||
return err
|
||||
}
|
||||
log.Info("ExecCheck() nil")
|
||||
// log.Info("ExecCheck() nil")
|
||||
return nil
|
||||
}
|
||||
|
||||
func PathExecVerbose(path string, args []string) error {
|
||||
if len(args) == 0 {
|
||||
return errors.New("Error: Command slice is empty.")
|
||||
}
|
||||
|
||||
// Start a long-running process, capture stdout and stderr
|
||||
a, b := RemoveFirstElement(args)
|
||||
|
||||
process := exec.Command(a, b...)
|
||||
process.Dir = path
|
||||
process.Stderr = os.Stderr
|
||||
process.Stdin = os.Stdin
|
||||
process.Stdout = os.Stdout
|
||||
err := process.Run()
|
||||
log.Info("Exec() cmd:", args)
|
||||
if err != nil {
|
||||
log.Info("ExecCheck() err", err)
|
||||
return err
|
||||
}
|
||||
// log.Info("ExecCheck() nil")
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
package shell
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
func SudoRaw(c []string) {
|
||||
args := []string{"-S"}
|
||||
args = append(args, c...)
|
||||
cmd := exec.Command("sudo", args...)
|
||||
|
||||
// Assign the current process's standard input, output, and error
|
||||
cmd.Stderr = os.Stderr
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stdin = os.Stdin
|
||||
|
||||
// Ensure the process has a terminal session
|
||||
cmd.SysProcAttr = &syscall.SysProcAttr{
|
||||
Setsid: true, // Start a new session
|
||||
}
|
||||
|
||||
err := cmd.Run()
|
||||
if err != nil {
|
||||
fmt.Println("Command execution failed:", err)
|
||||
}
|
||||
}
|
||||
|
||||
func Sudo(c []string) error {
|
||||
args := []string{"-S"}
|
||||
// args := []string{}
|
||||
args = append(args, c...)
|
||||
cmd := exec.Command("sudo", args...)
|
||||
|
||||
// Open the terminal device directly to preserve input/output control
|
||||
tty, err := os.OpenFile("/dev/tty", os.O_RDWR, 0)
|
||||
if err != nil {
|
||||
fmt.Println("Failed to open /dev/tty:", err)
|
||||
return err
|
||||
}
|
||||
defer tty.Close()
|
||||
|
||||
// Assign the TTY explicitly
|
||||
cmd.Stdin = tty
|
||||
cmd.Stdout = tty
|
||||
cmd.Stderr = tty
|
||||
|
||||
// Ensure the new process gets its own session
|
||||
cmd.SysProcAttr = &syscall.SysProcAttr{
|
||||
Setsid: true, // Start a new session
|
||||
}
|
||||
|
||||
// Run the command
|
||||
if err := cmd.Run(); err != nil {
|
||||
fmt.Println("Command execution failed:", err)
|
||||
}
|
||||
|
||||
fmt.Println("\nProcess finished. TTY restored.")
|
||||
return nil
|
||||
}
|
9
xterm.go
9
xterm.go
|
@ -3,7 +3,6 @@ package shell
|
|||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"go.wit.com/log"
|
||||
)
|
||||
|
@ -127,16 +126,17 @@ func XtermCmd(path string, cmd []string) {
|
|||
// runs an xterm
|
||||
// waits until xterm exits
|
||||
func XtermCmdWait(path string, cmd []string) {
|
||||
var argsXterm = getXtermCmd(cmd)
|
||||
// var argsXterm = getXtermCmd(cmd)
|
||||
|
||||
log.Info("XtermCmd() path =", path, "cmd =", argsXterm)
|
||||
log.Info("XtermCmd() path =", path, "cmd =", cmd)
|
||||
|
||||
// keeps git diff from exiting on small diffs
|
||||
os.Setenv("LESS", "-+F -+X -R")
|
||||
|
||||
PathRunLog(path, argsXterm, INFO)
|
||||
PathRunLog(path, cmd, INFO)
|
||||
}
|
||||
|
||||
/*
|
||||
// spawns an xterm with something you can run at a command line
|
||||
// then executes bash
|
||||
func XtermCmdBash(path string, cmd []string) {
|
||||
|
@ -149,3 +149,4 @@ func XtermCmdBash(path string, cmd []string) {
|
|||
log.Info("XtermCmd() path =", path, "cmd =", tmp)
|
||||
go PathRunLog(path, tmp, INFO)
|
||||
}
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue