XeRo/GoSetup-bubble
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Правки кода, завершение настройки после финальной секции

Browse source
This commit is contained in:
XeRo 2026-02-02 17:56:36 +05:00
parent d3fd4f5858
commit cb44386061
7 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
setup/utils/actions.go
View file

@ -100,7 +100,7 @@ func RunCommand(cmdStr, runAs string) (string, error) {
}
var cmd *exec.Cmd
if runAs != "" && runAs != "root" {
cmd = exec.Command("su", "-c", cmdStr, runAs)
cmd = exec.Command("sudo", "-u", runAs, "bash", "-c", cmdStr)
} else {
cmd = exec.Command("bash", "-c", cmdStr)
}
@ -142,7 +142,7 @@ func RenderFileTemplate(source, target string, vars map[string]interface{}) erro
//В файл помещаем переменные
if err = tmpl.Execute(&rendered, vars); err != nil {
return fmt.Errorf("ошибка подстановки значений в шаблон")
return fmt.Errorf("ошибка подстановки значений в шаблон: %v", err)
}
if _, err = os.Stat(target); err == nil {
backup := target + ".bak" + time.Now().Format("20060102-150405")

4
setup/utils/utils.go
View file

@ -255,7 +255,7 @@ func DefineExprCustomFunctions() []expr.Option {
return false, fmt.Errorf("file is dir")
}
if errors.Is(err, fs.ErrNotExist) {
return false, fmt.Errorf("no such directory or file")
return false, nil
} else {
return false, err
}
@ -275,7 +275,7 @@ func DefineExprCustomFunctions() []expr.Option {
return false, fmt.Errorf("file is not a dir")
}
if errors.Is(err, fs.ErrNotExist) {
return false, fmt.Errorf("no such directory or file")
return false, nil
} else {
return false, err
}