Merge branch 'master' of git.hxr.so:yige/electron-distribution

This commit is contained in:
yi-ge 2020-02-01 15:24:09 +08:00
commit 934df30846
4 changed files with 21 additions and 12 deletions

4
.gitignore vendored
View File

@ -12,4 +12,6 @@ npm-debug.log
.Spotlight-V100
.Trashes
yarn-error.log
yarn-error.log
.vscode

View File

@ -11,7 +11,9 @@ Electron build and auto update service, application distribution. Making applica
A git repository corresponds to an electron app and an distributed system.
Electron Distribution server-side work in 64 bit Linux OS (required) and MacOS (optional), and build for x64 platfrom, other platfrom need to modify the code (It is easy).
Electron Distribution server-side work in 64 bit Linux OS (required) and MacOS (optional), and build for x64 platform, other platform need to modify the code (It is easy).
![Electron Distribution](/preview.png)
## Quick Setup Guide
@ -174,3 +176,7 @@ Run the `ssh macName@macIp` in the linux server at least once .
Run the `ssh linux@linuxIp` in the mac server at least once.
Install `rsync` and enable sshd in your Linux Server.
## Author
Yi Wang a@wyr.me

BIN
preview.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 KiB

View File

@ -65,7 +65,7 @@ const gitCodeUpdate = async (buidType) => {
} else {
resolve({
code: 1,
type: 'clone',
type: 'pull',
change: false
})
}
@ -75,18 +75,19 @@ const gitCodeUpdate = async (buidType) => {
const promiseList = []
if (buidType.includes('mac')) {
if (!fs.existsSync(sourcePath)) {
mkdirsSync(sourcePath)
promiseList.push(gitClone(repoPath, sourcePath, 'Source'))
// 无论是否包含mac都应该更新参照代码
// if (buidType.includes('mac')) {
if (!fs.existsSync(sourcePath)) {
mkdirsSync(sourcePath)
promiseList.push(gitClone(repoPath, sourcePath, 'Source'))
} else {
if (fs.readdirSync(sourcePath).includes('.git')) {
promiseList.push(gitPull(sourcePath, 'Source'))
} else {
if (fs.readdirSync(sourcePath).includes('.git')) {
promiseList.push(gitPull(sourcePath, 'Source'))
} else {
promiseList.push(gitClone(repoPath, sourcePath, 'Source'))
}
promiseList.push(gitClone(repoPath, sourcePath, 'Source'))
}
}
// }
if (buidType.includes('linux')) {
if (!fs.existsSync(linuxPath)) {