mirror of
https://github.com/j3ssie/osmedeus.git
synced 2026-09-29 04:54:57 +02:00
Update v4.6.1
This commit is contained in:
+4
-2
@@ -242,7 +242,8 @@ func listFlows() error {
|
||||
table.SetAutoFormatHeaders(false)
|
||||
table.SetHeader([]string{"Flow Name", "Description"})
|
||||
table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true})
|
||||
table.SetColWidth(120)
|
||||
table.SetColWidth(110)
|
||||
table.SetAutoWrapText(true)
|
||||
table.AppendBulk(content)
|
||||
table.Render()
|
||||
|
||||
@@ -278,7 +279,8 @@ func listDefaultModules() error {
|
||||
table.SetAutoFormatHeaders(false)
|
||||
table.SetHeader([]string{"Module Name", "Description"})
|
||||
table.SetBorders(tablewriter.Border{Left: true, Top: true, Right: true, Bottom: true})
|
||||
table.SetColWidth(120)
|
||||
table.SetColWidth(110)
|
||||
table.SetAutoWrapText(true)
|
||||
table.AppendBulk(content)
|
||||
table.Render()
|
||||
|
||||
|
||||
+4
-5
@@ -420,13 +420,13 @@ func runCommandWithError(cmd string) (string, error) {
|
||||
go func() {
|
||||
for scanner.Scan() {
|
||||
out := scanner.Text()
|
||||
Debug(out)
|
||||
DebugF(out)
|
||||
output += out + "\n"
|
||||
}
|
||||
}()
|
||||
go func() {
|
||||
for errScanner.Scan() {
|
||||
Error(errScanner.Text())
|
||||
DebugF(errScanner.Text())
|
||||
}
|
||||
}()
|
||||
if err := realCmd.Start(); err != nil {
|
||||
@@ -461,7 +461,6 @@ func RunCommandWithErr(command string, timeoutRaw ...string) (string, error) {
|
||||
|
||||
select {
|
||||
case <-c.Done():
|
||||
|
||||
return output, err
|
||||
case <-time.After(time.Duration(timeout) * time.Second):
|
||||
return out, fmt.Errorf("command got timeout")
|
||||
@@ -492,7 +491,7 @@ func RunCommandSteamOutput(cmd string) (string, error) {
|
||||
}()
|
||||
go func() {
|
||||
for errScanner.Scan() {
|
||||
ErrorF(errScanner.Text())
|
||||
DebugF(errScanner.Text())
|
||||
}
|
||||
}()
|
||||
if err := realCmd.Start(); err != nil {
|
||||
@@ -522,7 +521,7 @@ func RunOSCommand(cmd string) (string, error) {
|
||||
go func() {
|
||||
for scanner.Scan() {
|
||||
out := scanner.Text()
|
||||
Debug(out)
|
||||
DebugF(out)
|
||||
output += out
|
||||
}
|
||||
}()
|
||||
|
||||
Reference in New Issue
Block a user