refactor: replace log with slog
This commit is contained in:
parent
31881c2daf
commit
3a321746bf
2 changed files with 8 additions and 29 deletions
|
|
@ -2,9 +2,10 @@ package dotfiles
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"system_setup_tool/internal/shell"
|
||||
)
|
||||
|
||||
|
|
@ -35,7 +36,7 @@ func SetupDotfiles(config DotfilesConfig) error {
|
|||
|
||||
cmd = shell.ExecCommand("stow", ".", "--override='*'")
|
||||
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")
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package tui
|
|||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"log/slog"
|
||||
|
||||
"system_setup_tool/internal/config"
|
||||
"system_setup_tool/internal/dotfiles"
|
||||
"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)
|
||||
}
|
||||
|
||||
// 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 {
|
||||
if config.Enable {
|
||||
var manager pm.PackageManager
|
||||
|
|
@ -74,15 +52,15 @@ func Run(cmd *cobra.Command, args []string) {
|
|||
}
|
||||
manager = pm.NewFlatpakManager(sudoPassword, flatpakConfig)
|
||||
default:
|
||||
log.Printf("unknown packagemanager: %s", name)
|
||||
slog.Warn(fmt.Sprintf("unknown packagemanager: %s", name))
|
||||
continue
|
||||
}
|
||||
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 {
|
||||
log.Printf("warning at %s-packages: %v", manager.Name(), err)
|
||||
slog.Warn(fmt.Sprintf("warning at %s-packages: %v", manager.Name(), err))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue