setup: gate setup and check for keydir

We don't need to run --migrate if there is no sbctl installed, so check that first and then check the keydir if there is something there already. Signed-off-by: Morten Linderud <[email protected]>
Foxboron · Jul 31, 2024 · de3aafc · de3aafc
1 parent b3ce9f7
commit de3aafc
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cmd/sbctl/setup.go b/cmd/sbctl/setup.go
@@ -152,13 +152,16 @@ func SetupInstallation(state *config.State) error {
 }
 
 func MigrateSetup(state *config.State) error {
+	if !state.IsInstalled() {
+		return fmt.Errorf("sbctl is not installd")
+	}
 
 	newConf := config.DefaultConfig()
 	p := path.Dir(newConf.Keydir)
 
 	// abort early if it exists
-	if ok, _ := afero.DirExists(state.Fs, p); ok {
-		logging.Print("%s already exists!\n", p)
+	if ok, _ := afero.DirExists(state.Fs, newConf.Keydir); ok {
+		logging.Println("sbctl has already been migrated!")
 		return nil
 	}