quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-12 20:18:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore line endings when comparing config file against default (#3645)

Browse source
This commit is contained in:
Juan Campa 2019-05-09 18:31:11 +00:00 committed by GitHub
parent efeedd0a9d
commit 6a05b7307c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/config/import.js
View file

@ -55,16 +55,20 @@ const migrateHyper2Config = () => {
return; return;
} }
const hasNewConfigBeenTouched = existsNew && readFileSync(cfgPath, 'utf8') !== readFileSync(defaultCfg, 'utf8'); if (existsNew) {
if (hasNewConfigBeenTouched) { const cfg1 = readFileSync(defaultCfg, 'utf8').replace(/\r|\n/g, '');
// Assume the user has migrated manually but rename old config to .backup so const cfg2 = readFileSync(cfgPath, 'utf8').replace(/\r|\n/g, '');
// we don't keep trying to migrate on every launch const hasNewConfigBeenTouched = cfg1 !== cfg2;
const backupPath = saveAsBackup(legacyCfgPath); if (hasNewConfigBeenTouched) {
notify( // Assume the user has migrated manually but rename old config to .backup so
'Hyper 3', // we don't keep trying to migrate on every launch
`Settings location has changed to ${cfgPath}.\nWe've backed up your old Hyper config to ${backupPath}` const backupPath = saveAsBackup(legacyCfgPath);
); notify(
return; 'Hyper 3',
`Settings location has changed to ${cfgPath}.\nWe've backed up your old Hyper config to ${backupPath}`
);
return;
}
} }
// Migrate // Migrate