setup: ensure we rename bundles db correctly and check that it exists

Foxboron · Foxboron · commit 80c451c8dea2 · 2024-07-31T14:19:24.000+02:00
Signed-off-by: Morten Linderud &lt;morten@linderud.pw&gt;
diff --git a/cmd/sbctl/setup.go b/cmd/sbctl/setup.go
@@ -190,8 +190,10 @@ func MigrateSetup(state *config.State) error {
 	if err := state.Fs.Rename(path.Join(p, "files.db"), newConf.FilesDb); err != nil {
 		return err
 	}
-	if err := state.Fs.Rename(path.Join(p, "bundles.db"), newConf.FilesDb); err != nil {
-		return err
+	if ok, _ := afero.Exists(state.Fs, path.Join(p, "bundles.db")); ok {
+		if err := state.Fs.Rename(path.Join(p, "bundles.db"), newConf.BundlesDb); err != nil {
+			return err
+		}
 	}
 	logging.Ok("")
 

Original file line number	Diff line number	Diff line change
`@@ -190,8 +190,10 @@ func MigrateSetup(state *config.State) error {`
`190`	`190`	`if err := state.Fs.Rename(path.Join(p, "files.db"), newConf.FilesDb); err != nil {`
`191`	`191`	`return err`
`192`	`192`	`}`
`193`		`- if err := state.Fs.Rename(path.Join(p, "bundles.db"), newConf.FilesDb); err != nil {`
`194`		`- return err`
	`193`	`+ if ok, _ := afero.Exists(state.Fs, path.Join(p, "bundles.db")); ok {`
	`194`	`+ if err := state.Fs.Rename(path.Join(p, "bundles.db"), newConf.BundlesDb); err != nil {`
	`195`	`+ return err`
	`196`	`+ }`
`195`	`197`	`}`
`196`	`198`	`logging.Ok("")`
`197`	`199`