self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Tools: Fix desktop build

Browse Source
This commit is contained in:
Laurent Cozic 2020-11-05 17:44:19 +00:00
parent c53cd52b4d
commit bc57d229fa
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -22,6 +22,7 @@
"setupNewRelease": "node ./packages/tools/setupNewRelease", "setupNewRelease": "node ./packages/tools/setupNewRelease",
"clean": "lerna clean -y && lerna run clean", "clean": "lerna clean -y && lerna run clean",
"linkChecker": "linkchecker https://joplinapp.org", "linkChecker": "linkchecker https://joplinapp.org",
"releaseDesktop": "node packages/tools/release-electron.js",
"publishAll": "git pull && lerna version --no-git-tag-version && gulp completePublishAll" "publishAll": "git pull && lerna version --no-git-tag-version && gulp completePublishAll"
}, },
"husky": { "husky": {

4
packages/tools/release-electron.js
View File

@ -1,7 +1,5 @@
const { execCommand, githubRelease } = require('./tool-utils.js'); const { execCommand, githubRelease, rootDir } = require('./tool-utils.js');
const path = require('path');
const rootDir = path.dirname(__dirname);
const appDir = `${rootDir}/packages/app-desktop`; const appDir = `${rootDir}/packages/app-desktop`;
async function main() { async function main() {

3
packages/tools/tool-utils.js
View File

@ -58,6 +58,9 @@ toolUtils.credentialDir = async function() {
throw new Error(`Could not find credential directory in any of these paths: ${JSON.stringify(toTry)}`); throw new Error(`Could not find credential directory in any of these paths: ${JSON.stringify(toTry)}`);
}; };
// Returns the project root dir
toolUtils.rootDir = require('path').dirname(require('path').dirname(__dirname));
toolUtils.credentialFile = async function(filename) { toolUtils.credentialFile = async function(filename) {
const rootDir = await toolUtils.credentialDir(); const rootDir = await toolUtils.credentialDir();
const output = `${rootDir}/${filename}`; const output = `${rootDir}/${filename}`;