Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 13:01:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

better fix for migration in electron + electron upgrade to 1.8.2 beta 3

Browse Source
This commit is contained in:
azivner 2017-12-06 21:15:46 -05:00
parent bbd1774815
commit 4f47c4d6e9
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package-lock.json generated
View File

@ -2419,19 +2419,19 @@
"integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=" "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo="
}, },
"electron": { "electron": {
"version": "1.8.2-beta.2", "version": "1.8.2-beta.3",
"resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.2.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.3.tgz",
"integrity": "sha1-tTLHEFDd0tSwDi4NNV3k51vB5f0=", "integrity": "sha1-Ljkcy9YnaKOzsmC48uPxZHNWeuw=",
"requires": { "requires": {
"@types/node": "8.0.49", "@types/node": "8.0.56",
"electron-download": "3.3.0", "electron-download": "3.3.0",
"extract-zip": "1.6.5" "extract-zip": "1.6.5"
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "8.0.49", "version": "8.0.56",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.49.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.56.tgz",
"integrity": "sha512-Oq3cV/mrMKy6Tv42llfS8YIH30ooDdhbJ40h1zoWl+goOJw8Kjy8j8RfjGZtZIUDO0gLwCfcbYM7+LModnbeMw==" "integrity": "sha512-JAlQv3hUWbrnruuTiLDf1scd4F/TBT0LgGEe+BBeF3p/Rc3yL6RV57WJN2nK5i+BshEz1sDllwH0Fzbuo7G4QA=="
} }
} }
}, },
@ -2590,7 +2590,7 @@
}, },
"fs-extra": { "fs-extra": {
"version": "0.30.0", "version": "0.30.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "resolved": "http://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
"integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
"requires": { "requires": {
"graceful-fs": "4.1.11", "graceful-fs": "4.1.11",
@ -2807,6 +2807,23 @@
"yargs": "6.6.0" "yargs": "6.6.0"
}, },
"dependencies": { "dependencies": {
"@types/node": {
"version": "8.0.56",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.56.tgz",
"integrity": "sha512-JAlQv3hUWbrnruuTiLDf1scd4F/TBT0LgGEe+BBeF3p/Rc3yL6RV57WJN2nK5i+BshEz1sDllwH0Fzbuo7G4QA==",
"dev": true
},
"electron": {
"version": "1.8.2-beta.2",
"resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.2.tgz",
"integrity": "sha1-tTLHEFDd0tSwDi4NNV3k51vB5f0=",
"dev": true,
"requires": {
"@types/node": "8.0.56",
"electron-download": "3.3.0",
"extract-zip": "1.6.5"
}
},
"yargs": { "yargs": {
"version": "6.6.0", "version": "6.6.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",

2
package.json
View File

@ -19,7 +19,7 @@
"debug": "~3.1.0", "debug": "~3.1.0",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"ejs": "~2.5.7", "ejs": "~2.5.7",
"electron": "^1.8.2-beta.2", "electron": "^1.8.2-beta.3",
"electron-debug": "^1.0.0", "electron-debug": "^1.0.0",
"express": "~4.16.2", "express": "~4.16.2",
"express-session": "^1.15.6", "express-session": "^1.15.6",

2
services/build.js
View File

@ -1 +1 @@
module.exports = { build_date:"2017-12-04T23:02:48-05:00", build_revision: "23e8e20d44ef029e6891dec6d2d855d282996823" }; module.exports = { build_date:"2017-12-06T21:05:03-05:00", build_revision: "bbd177481523bf6d7c9388b0ddf65af7f5c61e6b" };

7
services/migration.js
View File

@ -4,12 +4,9 @@ const options = require('./options');
const fs = require('fs-extra'); const fs = require('fs-extra');
const log = require('./log'); const log = require('./log');
const app_info = require('./app_info'); const app_info = require('./app_info');
const path = require('path');
let MIGRATIONS_DIR = "migrations"; const MIGRATIONS_DIR = path.resolve(__dirname, "..", "migrations");
if (!fs.existsSync(MIGRATIONS_DIR) && isElectron()) {
MIGRATIONS_DIR = "resources/app/migrations";
}
if (!fs.existsSync(MIGRATIONS_DIR)) { if (!fs.existsSync(MIGRATIONS_DIR)) {
log.error("Could not find migration directory: " + MIGRATIONS_DIR); log.error("Could not find migration directory: " + MIGRATIONS_DIR);