Compare commits

..

3 Commits

Author SHA1 Message Date
kuaifan
674c5a11c1 客户端pkg包安装前必须关闭已打开的应用 2022-01-07 10:56:07 +08:00
kuaifan
8e2b2947ae 版本号基于master分支生成 2022-01-07 10:16:35 +08:00
kuaifan
0413ca7cba 新增pkg安装包 2022-01-07 10:14:49 +08:00
8 changed files with 21 additions and 8 deletions

1
electron/build.js vendored
View File

@@ -136,6 +136,7 @@ function start(data, publish) {
econfig.build.appId = data.id;
econfig.build.artifactName = getDomain(data.url) + "-v${version}-${os}-${arch}.${ext}";
econfig.build.nsis.artifactName = getDomain(data.url) + "-v${version}-${os}-${arch}.${ext}";
econfig.build.pkg.mustClose = [data.id];
fs.writeFileSync(packageFile, JSON.stringify(econfig, null, 2), 'utf8');
// build
child_process.spawnSync("npm", ["run", data.platform + (publish === true ? "-publish" : "")], {stdio: "inherit", cwd: "electron"});

View File

@@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.5.58",
"version": "0.5.52",
"description": "DooTask is task management system.",
"main": "main.js",
"license": "MIT",
@@ -54,7 +54,10 @@
],
"mac": {
"icon": "../resources/assets/statics/public/images/logo-app.png",
"target": "dmg",
"target": [
"dmg",
"pkg"
],
"publish": [
"github"
]
@@ -73,6 +76,16 @@
"oneClick": false,
"artifactName": "${productName}-v${version}-${os}-${arch}.${ext}",
"allowToChangeInstallationDirectory": true
},
"pkg": {
"installLocation": "/Applications",
"mustClose": [],
"allowAnywhere": true,
"allowCurrentUserHome": true,
"allowRootDirectory": true,
"isVersionChecked": true,
"isRelocatable": false,
"overwriteAction": "upgrade"
}
},
"config": {

View File

@@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.5.58",
"version": "0.5.52",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
/*!
* html2canvas 1.3.3 <https://html2canvas.hertzen.com>
* html2canvas 1.3.4 <https://html2canvas.hertzen.com>
* Copyright (c) 2021 Niklas von Hertzen <https://hertzen.com>
* Released under MIT License
*/

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,5 @@
{
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css",
"/.DS_Store": "/.DS_Store",
"/favicon.ico": "/favicon.ico"
}

2
version.js vendored
View File

@@ -16,7 +16,7 @@ function runExec(command, cb) {
});
}
runExec("git rev-list --all --count", function (err, response) {
runExec("git rev-list --branches master --count", function (err, response) {
if (err) {
console.error(err);
return;