git/system_setup_tool
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity Actions

refactor: replace log with slog

Browse source
This commit is contained in:
Patryk Hegenberg 2025-06-12 10:20:38 +02:00
parent 31881c2daf
commit 3a321746bf
2 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/dotfiles/dotfiles.go
View file

@ -2,9 +2,10 @@ package dotfiles
import ( import (
"fmt" "fmt"
"log" "log/slog"
"os" "os"
"path/filepath" "path/filepath"
"system_setup_tool/internal/shell" "system_setup_tool/internal/shell"
) )
@ -35,7 +36,7 @@ func SetupDotfiles(config DotfilesConfig) error {
cmd = shell.ExecCommand("stow", ".", "--override='*'") cmd = shell.ExecCommand("stow", ".", "--override='*'")
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("error creating links: %v", err) slog.Error(fmt.Sprintf("error creating links: %v", err))
} }
fmt.Printf("all linked properly\n") fmt.Printf("all linked properly\n")

32
internal/tui/tui.go
View file

@ -3,6 +3,8 @@ package tui
import ( import (
"fmt" "fmt"
"log" "log"
"log/slog"
"system_setup_tool/internal/config" "system_setup_tool/internal/config"
"system_setup_tool/internal/dotfiles" "system_setup_tool/internal/dotfiles"
"system_setup_tool/internal/utils" "system_setup_tool/internal/utils"
@ -28,30 +30,6 @@ func Run(cmd *cobra.Command, args []string) {
log.Fatalf("Fehler beim Lesen der Konfiguration: %v", err) log.Fatalf("Fehler beim Lesen der Konfiguration: %v", err)
} }
// form := huh.NewForm(
// huh.NewGroup(
// huh.NewConfirm().
// Title("Möchten Sie eine headless Installation durchführen?").
// Value(&cfg.Headless),
// ),
// ).WithTheme(huh.ThemeCatppuccin())
//
// if err := form.Run(); err != nil {
// log.Fatalf("Fehler bei der Benutzerabfrage: %v", err)
// }
//
// osManager := pm.NewOSManager(sudoPassword)
//
// if err := osManager.Install(cfg.Packages.Headless); err != nil {
// log.Printf("Warnung bei der Installation der Headless-Pakete: %v", err)
// }
// if !cfg.Headless {
// if err := osManager.Install(cfg.Packages.NonHeadless); err != nil {
// log.Printf("Warnung bei der Installation der Non-Headless-Pakete: %v", err)
// }
// }
//
for name, config := range cfg.PackageManagers { for name, config := range cfg.PackageManagers {
if config.Enable { if config.Enable {
var manager pm.PackageManager var manager pm.PackageManager
@ -74,15 +52,15 @@ func Run(cmd *cobra.Command, args []string) {
} }
manager = pm.NewFlatpakManager(sudoPassword, flatpakConfig) manager = pm.NewFlatpakManager(sudoPassword, flatpakConfig)
default: default:
log.Printf("unknown packagemanager: %s", name) slog.Warn(fmt.Sprintf("unknown packagemanager: %s", name))
continue continue
} }
if err := manager.InstallManager(); err != nil { if err := manager.InstallManager(); err != nil {
log.Printf("warning packagemanager %s not installed and could not be installed: %v", manager.Name(), err) slog.Warn(fmt.Sprintf("packagemanager %s not installed and could not be installed: %v", manager.Name(), err))
} }
if err := manager.Install(config.Packages); err != nil { if err := manager.Install(config.Packages); err != nil {
log.Printf("warning at %s-packages: %v", manager.Name(), err) slog.Warn(fmt.Sprintf("warning at %s-packages: %v", manager.Name(), err))
} }
} }
} }