yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Don't migrate if prefs doesn't exist

Browse Source
This commit is contained in:
James Houlahan
2022-11-21 18:01:29 +01:00
parent 355ae5f046
commit b97ffc16ea
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/app/migration.go
View File

@ -20,6 +20,7 @@ package app
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/fs"
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -48,7 +49,9 @@ func migrateKeychainHelper(locations *locations.Locations) error {
} }
b, err := os.ReadFile(filepath.Join(configDir, "protonmail", "bridge", "prefs.json")) b, err := os.ReadFile(filepath.Join(configDir, "protonmail", "bridge", "prefs.json"))
if err != nil { if errors.Is(err, fs.ErrNotExist) {
return nil
} else if err != nil {
return fmt.Errorf("failed to read old prefs file: %w", err) return fmt.Errorf("failed to read old prefs file: %w", err)
} }
@ -78,7 +81,9 @@ func migrateOldSettings(v *vault.Vault) error {
} }
b, err := os.ReadFile(filepath.Join(configDir, "protonmail", "bridge", "prefs.json")) b, err := os.ReadFile(filepath.Join(configDir, "protonmail", "bridge", "prefs.json"))
if err != nil { if errors.Is(err, fs.ErrNotExist) {
return nil
} else if err != nil {
return fmt.Errorf("failed to read old prefs file: %w", err) return fmt.Errorf("failed to read old prefs file: %w", err)
} }