From ee85b7c9d208a4fd0f512ddeaca5e865346b0858 Mon Sep 17 00:00:00 2001
From: Marvin Steadfast <marvin@xsteadfastx.org>
Date: Mon, 3 May 2021 17:29:26 +0200
Subject: [PATCH] fix: template and file location in new asset fs object

---
 pkg/prepare/prepare.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/prepare/prepare.go b/pkg/prepare/prepare.go
index d9dae66..e19cde7 100644
--- a/pkg/prepare/prepare.go
+++ b/pkg/prepare/prepare.go
@@ -58,7 +58,7 @@ func boxService(filename string, enable bool) error {
 		return fmt.Errorf("could not create config dir: %w", err)
 	}
 
-	schnutiboxService, err := assets.Files.ReadFile("files/prepare/schnutibox.service")
+	schnutiboxService, err := assets.Files.ReadFile("files/schnutibox.service")
 	if err != nil {
 		return fmt.Errorf("could not get service file: %w", err)
 	}
@@ -100,7 +100,7 @@ func ntp() error {
 		return fmt.Errorf("could not install ntp: %w", err)
 	}
 
-	ntpService, err := assets.Files.ReadFile("files/prepare/ntp.service")
+	ntpService, err := assets.Files.ReadFile("files/ntp.service")
 	if err != nil {
 		return fmt.Errorf("could not get ntp service file: %w", err)
 	}
@@ -195,7 +195,7 @@ func fstab(system string) error {
 
 	// Chose the right template.
 	// In future it should be a switch statement.
-	tmpl, err := assets.Templates.ReadFile("templates/prepare/fstab.raspbian.tmpl")
+	tmpl, err := assets.Templates.ReadFile("templates/fstab.raspbian.tmpl")
 	if err != nil {
 		return fmt.Errorf("could not get fstab template: %w", err)
 	}
@@ -283,7 +283,7 @@ func udevRules() error {
 	logger.Info().Msg("writing udev rule file")
 
 	// Parse template.
-	tmpl, err := assets.Templates.ReadFile("templates/prepare/50-neuftech.rules.tmpl")
+	tmpl, err := assets.Templates.ReadFile("templates/50-neuftech.rules.tmpl")
 	if err != nil {
 		return fmt.Errorf("could not get udev rules file: %w", err)
 	}
@@ -518,7 +518,7 @@ func mopidy() error {
 		Cfg.Spotify = true
 	}
 
-	tmpl, err := assets.Templates.ReadFile("templates/prepare/mopidy.conf.tmpl")
+	tmpl, err := assets.Templates.ReadFile("templates/mopidy.conf.tmpl")
 	if err != nil {
 		return fmt.Errorf("could not get mopidy.conf: %w", err)
 	}
@@ -610,7 +610,7 @@ func upmpdcli() error {
 	}
 
 	// Create config.
-	upmpdcliConf, err := assets.Files.ReadFile("files/prepare/upmpdcli.conf")
+	upmpdcliConf, err := assets.Files.ReadFile("files/upmpdcli.conf")
 	if err != nil {
 		return fmt.Errorf("could not get upmpdcli.conf: %w", err)
 	}
@@ -693,7 +693,7 @@ func schnutiboxConfig() error {
 	logger.Info().Msg("writing schnutibox config")
 
 	// Parse template.
-	tmpl, err := assets.Templates.ReadFile("templates/prepare/schnutibox.yml.tmpl")
+	tmpl, err := assets.Templates.ReadFile("templates/schnutibox.yml.tmpl")
 	if err != nil {
 		return fmt.Errorf("could not get template: %w", err)
 	}