Назначение префикса и placeholder через переменные оболочки
This commit is contained in:
+16
-11
@@ -3,13 +3,15 @@ package executor
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os/exec"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var ErrBuiltInExit = errors.New("exit command")
|
||||
var localVars = make(map[string]string)
|
||||
var (
|
||||
ErrBuiltInExit = errors.New("exit command")
|
||||
localVars = make(map[string]string)
|
||||
)
|
||||
|
||||
func PrepareCommand(in string) (*exec.Cmd, error) {
|
||||
in = strings.TrimSpace(in)
|
||||
@@ -17,21 +19,25 @@ func PrepareCommand(in string) (*exec.Cmd, error) {
|
||||
return nil, nil
|
||||
}
|
||||
if strings.Contains(in, "=") && !strings.HasPrefix(in, "export ") {
|
||||
parts := strings.SplitN(in, "=", 2)
|
||||
key := strings.TrimSpace(parts[0])
|
||||
value := strings.TrimSpace(parts[1])
|
||||
parts := strings.SplitN(in, "=", 2)
|
||||
key := strings.TrimSpace(parts[0])
|
||||
value := strings.TrimSpace(parts[1])
|
||||
|
||||
localVars[key] = value
|
||||
return nil,nil
|
||||
}
|
||||
localVars[key] = value
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
in = os.Expand(in, GetVariable)
|
||||
|
||||
in = strings.TrimSpace(in)
|
||||
|
||||
parts := strings.Fields(in)
|
||||
head := parts[0]
|
||||
args := parts[1:]
|
||||
|
||||
if len(parts) == 0 {
|
||||
return nil, nil // Если после os.Expand строка стала пустой, безопасно выходим
|
||||
}
|
||||
|
||||
switch head {
|
||||
case "exit":
|
||||
return nil, ErrBuiltInExit
|
||||
@@ -49,7 +55,6 @@ func PrepareCommand(in string) (*exec.Cmd, error) {
|
||||
return exec.Command(fullPath, args...), nil
|
||||
}
|
||||
|
||||
|
||||
func GetVariable(key string) string {
|
||||
if val, exists := localVars[key]; exists {
|
||||
return val
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package executor
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
)
|
||||
|
||||
const defaultStartScript string = `
|
||||
echo meow meow
|
||||
NSHELL_NO_TEXT_PLACEHOLDER=Type Noko Meow Meow
|
||||
NSHELL_PREFIX=noko>
|
||||
`
|
||||
|
||||
func ExecSetUpScript() {
|
||||
scanner := bufio.NewScanner(strings.NewReader(defaultStartScript))
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
cmd, err := PrepareCommand(line)
|
||||
if err != nil {
|
||||
fmt.Printf("Error %s\n", err.Error())
|
||||
}
|
||||
if err != nil {
|
||||
fmt.Printf("Error preparing command: %s\n", err.Error())
|
||||
continue
|
||||
}
|
||||
|
||||
if cmd == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
err = cmd.Run()
|
||||
if err != nil {
|
||||
fmt.Printf("Ошибка при выполнении команды: %s\n", err.Error())
|
||||
}
|
||||
}
|
||||
if err := scanner.Err(); err != nil {
|
||||
fmt.Println("Ошибка чтения:", err)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user